diff --git a/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.cpp b/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.cpp index c4fd4f0cc..7dd47a3bb 100644 --- a/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.cpp +++ b/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.cpp @@ -787,10 +787,10 @@ void InnerWidget::paintEvent(QPaintEvent *e) auto clip = e->rect(); auto context = _controller->preparePaintContext({ .theme = _theme.get(), - .visibleAreaTop = _visibleTop, - .visibleAreaTopGlobal = mapToGlobal(QPoint(0, _visibleTop)).y(), - .visibleAreaWidth = width(), .clip = clip, + .visibleAreaPositionGlobal = mapToGlobal(QPoint(0, _visibleTop)), + .visibleAreaTop = _visibleTop, + .visibleAreaWidth = width(), }); if (_items.empty() && _upLoaded && _downLoaded) { paintEmpty(p, context.st); diff --git a/Telegram/SourceFiles/ayu/utils/qt_key_modifiers_extended.h b/Telegram/SourceFiles/ayu/utils/qt_key_modifiers_extended.h index 799c3472a..4229e28e2 100644 --- a/Telegram/SourceFiles/ayu/utils/qt_key_modifiers_extended.h +++ b/Telegram/SourceFiles/ayu/utils/qt_key_modifiers_extended.h @@ -10,10 +10,6 @@ namespace base { -[[nodiscard]] inline bool IsShiftPressed() { - return (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier); -} - [[nodiscard]] inline bool IsExtendedContextMenuModifierPressed() { return IsShiftPressed() || IsCtrlPressed(); } diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp index c90e88233..9865c5ea2 100644 --- a/Telegram/SourceFiles/core/shortcuts.cpp +++ b/Telegram/SourceFiles/core/shortcuts.cpp @@ -59,7 +59,7 @@ const auto CommandByName = base::flat_map{ { u"close_telegram"_q , Command::Close }, { u"lock_telegram"_q , Command::Lock }, { 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_pause"_q , Command::MediaPause }, @@ -112,7 +112,7 @@ const auto CommandNames = base::flat_map{ { Command::Close , u"close_telegram"_q }, { Command::Lock , u"lock_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::MediaPause , u"media_pause"_q }, diff --git a/Telegram/lib_ui b/Telegram/lib_ui index d79a85b11..6fff803db 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit d79a85b117f32d97670fe37f3aec6b1e4faa658c +Subproject commit 6fff803db5e301f89b3a6a8af8ec38f4dcf5d97c