dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Jonas Kvinge
2021-08-23 21:21:08 +02:00
parent ed7794f396
commit ea2bfbda44
111 changed files with 833 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/globalshortcuts/globalshortcutgrabber.cpp
View File

@@ -93,10 +93,12 @@ bool GlobalShortcutGrabber::event(QEvent *e) {
if (e->type() == QEvent::ShortcutOverride) {
QKeyEvent *ke = static_cast<QKeyEvent*>(e);
if (modifier_keys_.contains(ke->key()))
if (modifier_keys_.contains(ke->key())) {
ret_ = QKeySequence(ke->modifiers());
else
}
else {
ret_ = QKeySequence(ke->modifiers() | ke->key());
}
UpdateText();

9
src/globalshortcuts/globalshortcutsmanager.cpp
View File

@@ -93,16 +93,19 @@ GlobalShortcutsManager::GlobalShortcutsManager(QWidget *parent)
#endif
#ifdef Q_OS_MACOS
if (!system_backend_)
if (!system_backend_) {
system_backend_ = new GlobalShortcutsBackendMacOS(this);
}
#endif
#ifdef Q_OS_WIN
if (!system_backend_)
if (!system_backend_) {
system_backend_ = new GlobalShortcutsBackendSystem(this);
}
#endif
#ifdef HAVE_X11_GLOBALSHORTCUTS
if (!system_backend_ && IsX11Available())
if (!system_backend_ && IsX11Available()) {
system_backend_ = new GlobalShortcutsBackendSystem(this);
}
#endif
ReloadSettings();