diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-09-09 22:54:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-09-09 22:56:17 +0300 |
| commit | 481ea0b776bbab92b500540f59c5a191c6e93cba (patch) | |
| tree | 5b73e15b5ab16d67095852d83ba764d83c36cbb8 /src/gui | |
| parent | c108b00ddc98e99182bf1a0f83602772f4931122 (diff) | |
| download | ManaVerse-481ea0b776bbab92b500540f59c5a191c6e93cba.tar.gz ManaVerse-481ea0b776bbab92b500540f59c5a191c6e93cba.tar.bz2 ManaVerse-481ea0b776bbab92b500540f59c5a191c6e93cba.tar.xz ManaVerse-481ea0b776bbab92b500540f59c5a191c6e93cba.zip | |
Add workaround for fix alt-tab issue in SDL2.
Also add option to enable/disable this workaround.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/tabs/chat/chattab.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_other.cpp | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp index ae75f9981..e4f6d751a 100644 --- a/src/gui/widgets/tabs/chat/chattab.cpp +++ b/src/gui/widgets/tabs/chat/chattab.cpp @@ -312,7 +312,8 @@ void ChatTab::chatLog(std::string line, return; const bool notFocused = WindowManager::getIsMinimized() || - (!settings.mouseFocused && !settings.inputFocused); + (!settings.mouseFocused && + settings.inputFocused == KeyboardFocus::Unfocused); if (this != tabArea->getSelectedTab() || notFocused) { diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp index 413b93a7f..e608d27e1 100644 --- a/src/gui/widgets/tabs/setup_other.cpp +++ b/src/gui/widgets/tabs/setup_other.cpp @@ -332,6 +332,13 @@ Setup_Other::Setup_Other(const Widget2 *const widget) : new SetupItemIntTextField(_("Custom repeat interval"), "", "repeateInterval2", this, "repeateInterval2Event", 0, 10000); +#ifdef USE_SDL2 + // TRANSLATORS: settings option + new SetupItemCheckBox(_("Enable alt-tab workaround"), "", + "blockAltTab", this, "blockAltTabEvent"); +#endif // USE_SDL2 + + // TRANSLATORS: settings group new SetupItemLabel(_("Windows"), "", this); |