void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: make it compile

Browse source 
fix: restore Quit shortcut for use in custom shortcuts file
This commit is contained in:
ZavaruKitsu 2024-01-17 01:05:24 +03:00
parent abf17407ea
commit fe64dfeb1f
4 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.cpp
View file

@ -787,10 +787,10 @@ void InnerWidget::paintEvent(QPaintEvent *e)
auto clip = e->rect(); auto clip = e->rect();
auto context = _controller->preparePaintContext({ auto context = _controller->preparePaintContext({
.theme = _theme.get(), .theme = _theme.get(),
.visibleAreaTop = _visibleTop,
.visibleAreaTopGlobal = mapToGlobal(QPoint(0, _visibleTop)).y(),
.visibleAreaWidth = width(),
.clip = clip, .clip = clip,
.visibleAreaPositionGlobal = mapToGlobal(QPoint(0, _visibleTop)),
.visibleAreaTop = _visibleTop,
.visibleAreaWidth = width(),
}); });
if (_items.empty() && _upLoaded && _downLoaded) { if (_items.empty() && _upLoaded && _downLoaded) {
paintEmpty(p, context.st); paintEmpty(p, context.st);

4
Telegram/SourceFiles/ayu/utils/qt_key_modifiers_extended.h
View file

@ -10,10 +10,6 @@
namespace base { namespace base {
[[nodiscard]] inline bool IsShiftPressed() {
return (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier);
}
[[nodiscard]] inline bool IsExtendedContextMenuModifierPressed() { [[nodiscard]] inline bool IsExtendedContextMenuModifierPressed() {
return IsShiftPressed() || IsCtrlPressed(); return IsShiftPressed() || IsCtrlPressed();
} }

4
Telegram/SourceFiles/core/shortcuts.cpp
View file

@ -59,7 +59,7 @@ const auto CommandByName = base::flat_map<QString, Command>{
{ u"close_telegram"_q , Command::Close }, { u"close_telegram"_q , Command::Close },
{ u"lock_telegram"_q , Command::Lock }, { u"lock_telegram"_q , Command::Lock },
{ u"minimize_telegram"_q , Command::Minimize }, { u"minimize_telegram"_q , Command::Minimize },
// { u"quit_telegram"_q , Command::Quit }, { u"quit_telegram"_q , Command::Quit },
{ u"media_play"_q , Command::MediaPlay }, { u"media_play"_q , Command::MediaPlay },
{ u"media_pause"_q , Command::MediaPause }, { u"media_pause"_q , Command::MediaPause },
@ -112,7 +112,7 @@ const auto CommandNames = base::flat_map<Command, QString>{
{ Command::Close , u"close_telegram"_q }, { Command::Close , u"close_telegram"_q },
{ Command::Lock , u"lock_telegram"_q }, { Command::Lock , u"lock_telegram"_q },
{ Command::Minimize , u"minimize_telegram"_q }, { Command::Minimize , u"minimize_telegram"_q },
// { Command::Quit , u"quit_telegram"_q }, { Command::Quit , u"quit_telegram"_q },
{ Command::MediaPlay , u"media_play"_q }, { Command::MediaPlay , u"media_play"_q },
{ Command::MediaPause , u"media_pause"_q }, { Command::MediaPause , u"media_pause"_q },

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit d79a85b117f32d97670fe37f3aec6b1e4faa658c Subproject commit 6fff803db5e301f89b3a6a8af8ec38f4dcf5d97c