[Scummvm-git-logs] scummvm master -> fb9abcd154d01d4494dda232010196f39e2cd99a
criezy
criezy at scummvm.org
Sat Aug 29 15:32:03 UTC 2020
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3baad9e2a4 IOS7: Hide virtual keyboard input assistant bar
96c977cd56 ENGINES: Reset virtual keyboard state when showing and hiding GMM
d25fb352d8 GLK: Enable virtual keyboard when the engine is running
cca6090454 ADL: Enable virtual keyboard when the engine is running
760815b3b8 BACKENDS: Do not define a Quit action if the NoQuit feature is enabled
fb9abcd154 KEYMAPPER: Enable virtual keyboard while remapping keys
Commit: 3baad9e2a495a00b1d77155667f85a07101e2fba
https://github.com/scummvm/scummvm/commit/3baad9e2a495a00b1d77155667f85a07101e2fba
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-08-29T16:31:37+01:00
Commit Message:
IOS7: Hide virtual keyboard input assistant bar
Changed paths:
backends/platform/ios7/ios7_keyboard.mm
diff --git a/backends/platform/ios7/ios7_keyboard.mm b/backends/platform/ios7/ios7_keyboard.mm
index 9b3ca66981..5117a7a7a9 100644
--- a/backends/platform/ios7/ios7_keyboard.mm
+++ b/backends/platform/ios7/ios7_keyboard.mm
@@ -52,9 +52,23 @@
[self setAutocorrectionType:UITextAutocorrectionTypeNo];
[self setAutocapitalizationType:UITextAutocapitalizationTypeNone];
[self setEnablesReturnKeyAutomatically:NO];
- //UITextInputAssistantItem* item = [self inputAssistantItem];
- //item.leadingBarButtonGroups = @[];
- //item.trailingBarButtonGroups = @[];
+
+ // Hide the input assistent bar. The API is only available since IOS 9.0.
+ // The code only compils with the iOS 9.0+ SDK, and only works on iOS 9.0
+ // or above.
+#ifdef __IPHONE_9_0
+#if __has_builtin(__builtin_available)
+ if ( @available(iOS 9,*) ) {
+#else
+ if ( [self respondsToSelector:@selector(inputAssistantItem)] ) {
+#endif
+ UITextInputAssistantItem* item = [self inputAssistantItem];
+ if (item) {
+ item.leadingBarButtonGroups = @[];
+ item.trailingBarButtonGroups = @[];
+ }
+ }
+#endif
toolbar = [[UIToolbar alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 0.0f, 0.0f)];
toolbar.barTintColor = keyboard.backgroundColor;
Commit: 96c977cd56a08fca5d30046e17ce1973693a899e
https://github.com/scummvm/scummvm/commit/96c977cd56a08fca5d30046e17ce1973693a899e
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-08-29T16:31:37+01:00
Commit Message:
ENGINES: Reset virtual keyboard state when showing and hiding GMM
Changed paths:
engines/engine.cpp
diff --git a/engines/engine.cpp b/engines/engine.cpp
index ba0a223625..ef827f638c 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -581,8 +581,15 @@ void Engine::openMainMenuDialog() {
setGameToLoadSlot(-1);
+ bool hasVKeyb = g_system->getFeatureState(OSystem::kFeatureVirtualKeyboard);
+ if (hasVKeyb)
+ g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
+
runDialog(*_mainMenuDialog);
+ if (hasVKeyb)
+ g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
+
// Load savegame after main menu execution
// (not from inside the menu loop to avoid
// mouse cursor glitches and similar bugs,
Commit: d25fb352d8af68eaf9d6f237bde0f39e44328340
https://github.com/scummvm/scummvm/commit/d25fb352d8af68eaf9d6f237bde0f39e44328340
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-08-29T16:31:37+01:00
Commit Message:
GLK: Enable virtual keyboard when the engine is running
Changed paths:
engines/glk/glk.cpp
diff --git a/engines/glk/glk.cpp b/engines/glk/glk.cpp
index cb4a753e5f..43a077bb25 100644
--- a/engines/glk/glk.cpp
+++ b/engines/glk/glk.cpp
@@ -154,7 +154,9 @@ Common::Error GlkEngine::run() {
initialize();
// Play the game
+ g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
runGame();
+ g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
return Common::kNoError;
}
Commit: cca6090454c796c3af8c0c2eb0f8b2b3a511bef6
https://github.com/scummvm/scummvm/commit/cca6090454c796c3af8c0c2eb0f8b2b3a511bef6
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-08-29T16:31:37+01:00
Commit Message:
ADL: Enable virtual keyboard when the engine is running
Changed paths:
engines/adl/adl.cpp
diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index e6679c9946..db70ac3d9a 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -733,6 +733,7 @@ Common::Error AdlEngine::run() {
setupOpcodeTables();
init();
+ g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
int saveSlot = ConfMan.getInt("save_slot");
if (saveSlot >= 0) {
@@ -751,6 +752,8 @@ Common::Error AdlEngine::run() {
while (!(_isQuitting || shouldQuit()))
gameLoop();
+ g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
+
return Common::kNoError;
}
Commit: 760815b3b8b6c6991f95c9a9cbacfcf9c1d3b84f
https://github.com/scummvm/scummvm/commit/760815b3b8b6c6991f95c9a9cbacfcf9c1d3b84f
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-08-29T16:31:37+01:00
Commit Message:
BACKENDS: Do not define a Quit action if the NoQuit feature is enabled
Changed paths:
backends/events/default/default-events.cpp
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp
index 3ec5ec4264..4c631fb5e0 100644
--- a/backends/events/default/default-events.cpp
+++ b/backends/events/default/default-events.cpp
@@ -312,26 +312,28 @@ Common::Keymap *DefaultEventManager::getGlobalKeymap() {
act->setEvent(EVENT_MUTE);
globalKeymap->addAction(act);
- act = new Action("QUIT", _("Quit"));
- act->setEvent(EVENT_QUIT);
+ if (!g_system->hasFeature(OSystem::kFeatureNoQuit)) {
+ act = new Action("QUIT", _("Quit"));
+ act->setEvent(EVENT_QUIT);
#if defined(MACOSX)
- // On Macintosh, Cmd-Q quits
- act->addDefaultInputMapping("M+q");
+ // On Macintosh, Cmd-Q quits
+ act->addDefaultInputMapping("M+q");
#elif defined(POSIX)
- // On other *nix systems, Control-Q quits
- act->addDefaultInputMapping("C+q");
+ // On other *nix systems, Control-Q quits
+ act->addDefaultInputMapping("C+q");
#else
- // Ctrl-z quits
- act->addDefaultInputMapping("C+z");
+ // Ctrl-z quits
+ act->addDefaultInputMapping("C+z");
#ifdef WIN32
- // On Windows, also use the default Alt-F4 quit combination
- act->addDefaultInputMapping("A+F4");
+ // On Windows, also use the default Alt-F4 quit combination
+ act->addDefaultInputMapping("A+F4");
#endif
#endif
- globalKeymap->addAction(act);
+ globalKeymap->addAction(act);
+ }
act = new Action("DEBUGGER", _("Open Debugger"));
act->addDefaultInputMapping("C+A+d");
Commit: fb9abcd154d01d4494dda232010196f39e2cd99a
https://github.com/scummvm/scummvm/commit/fb9abcd154d01d4494dda232010196f39e2cd99a
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-08-29T16:31:37+01:00
Commit Message:
KEYMAPPER: Enable virtual keyboard while remapping keys
Changed paths:
backends/keymapper/remap-widget.cpp
diff --git a/backends/keymapper/remap-widget.cpp b/backends/keymapper/remap-widget.cpp
index 327e02c0a5..92ff46ee79 100644
--- a/backends/keymapper/remap-widget.cpp
+++ b/backends/keymapper/remap-widget.cpp
@@ -222,9 +222,13 @@ void RemapWidget::startRemapping(uint actionIndex) {
_actions[actionIndex].keyButton->setLabel("...");
_actions[actionIndex].keyButton->setTooltip("");
_actions[actionIndex].keyButton->markAsDirty();
+
+ g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
}
void RemapWidget::stopRemapping() {
+ g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
+
_remapKeymap = nullptr;
_remapAction = nullptr;
More information about the Scummvm-git-logs
mailing list