[Scummvm-git-logs] scummvm master -> a5253b169b0aef01faa0a74b15abbdcc58e4b7b6

[SupSuper]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a5253b169b BAGEL: Disable keymapper during save text input


Commit: a5253b169b0aef01faa0a74b15abbdcc58e4b7b6
    https://github.com/scummvm/scummvm/commit/a5253b169b0aef01faa0a74b15abbdcc58e4b7b6
Author: SupSuper (supsuper at gmail.com)
Date: 2024-05-16T22:16:17+01:00

Commit Message:
BAGEL: Disable keymapper during save text input

Changed paths:
    engines/bagel/bagel.cpp
    engines/bagel/bagel.h
    engines/bagel/dialogs/save_dialog.cpp


diff --git a/engines/bagel/bagel.cpp b/engines/bagel/bagel.cpp
index 7ed0d811875..9a26e2a901c 100644
--- a/engines/bagel/bagel.cpp
+++ b/engines/bagel/bagel.cpp
@@ -23,6 +23,8 @@
 #include "bagel/detection.h"
 #include "bagel/music.h"
 
+#include "backends/keymapper/keymapper.h"
+
 #include "bagel/baglib/bagel.h"
 #include "bagel/baglib/character_object.h"
 #include "bagel/baglib/cursor.h"
@@ -214,4 +216,8 @@ void BagelEngine::errorDialog(const char *msg) {
 	GUIErrorMessage(msg);
 }
 
+void BagelEngine::enableKeymapper(bool enabled) {
+	getEventManager()->getKeymapper()->setEnabled(enabled);
+}
+
 } // End of namespace Bagel
diff --git a/engines/bagel/bagel.h b/engines/bagel/bagel.h
index cd73fd7a356..7da90aaf3ab 100644
--- a/engines/bagel/bagel.h
+++ b/engines/bagel/bagel.h
@@ -125,6 +125,8 @@ public:
 	void pauseEngineIntern(bool pause) override;
 
 	void errorDialog(const char *msg);
+
+	void enableKeymapper(bool enabled);
 };
 
 extern BagelEngine *g_engine;
diff --git a/engines/bagel/dialogs/save_dialog.cpp b/engines/bagel/dialogs/save_dialog.cpp
index e935052784c..ed68a2d4851 100644
--- a/engines/bagel/dialogs/save_dialog.cpp
+++ b/engines/bagel/dialogs/save_dialog.cpp
@@ -97,6 +97,8 @@ CBagSaveDialog::CBagSaveDialog() {
 ErrorCode CBagSaveDialog::attach() {
 	assert(isValidObject(this));
 
+	g_engine->enableKeymapper(false);
+
 	// Save off the current game's palette
 	_pSavePalette = CBofApp::getApp()->getPalette();
 
@@ -222,6 +224,8 @@ ErrorCode CBagSaveDialog::attach() {
 ErrorCode CBagSaveDialog::detach() {
 	assert(isValidObject(this));
 
+	g_engine->enableKeymapper(true);
+
 	CBagCursor::hideSystemCursor();
 
 	delete _pScrollBar;