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

Fix recording shortcuts on Windows.

Browse source
This commit is contained in:
John Preston 2025-02-13 19:03:34 +04:00
parent ded0936bc4
commit cb8d40eaf2
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Telegram/SourceFiles/settings/settings_shortcuts.cpp
View file

@ -21,6 +21,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "styles/style_menu_icons.h" #include "styles/style_menu_icons.h"
#include "styles/style_settings.h" #include "styles/style_settings.h"
#include <qpa/qplatformintegration.h>
#include <private/qguiapplication_p.h>
namespace Settings { namespace Settings {
namespace { namespace {
@ -381,6 +384,7 @@ struct Labeled {
} }
const auto key = static_cast<QKeyEvent*>(e.get()); const auto key = static_cast<QKeyEvent*>(e.get());
const auto m = key->modifiers(); const auto m = key->modifiers();
const auto integration = QGuiApplicationPrivate::platformIntegration();
const auto k = key->key(); const auto k = key->key();
const auto clear = !m const auto clear = !m
&& (k == Qt::Key_Backspace || k == Qt::Key_Delete); && (k == Qt::Key_Backspace || k == Qt::Key_Delete);
@ -396,7 +400,19 @@ struct Labeled {
} }
return base::EventFilterResult::Cancel; return base::EventFilterResult::Cancel;
} }
stopRecording(clear ? QKeySequence() : QKeySequence(k | m)); const auto r = [&] {
auto result = k;
if (m & Qt::ShiftModifier) {
const auto keys = integration->possibleKeys(key);
for (const auto possible : keys) {
if (possible > m) {
return possible - m;
}
}
}
return result;
}();
stopRecording(clear ? QKeySequence() : QKeySequence(r | m));
return base::EventFilterResult::Cancel; return base::EventFilterResult::Cancel;
} else if (type == QEvent::KeyPress && state->recording.current()) { } else if (type == QEvent::KeyPress && state->recording.current()) {
if (!content->window()->isActiveWindow()) { if (!content->window()->isActiveWindow()) {