[Scummvm-cvs-logs] CVS: scummvm gui.cpp,1.66,1.67

Nicolas Bacca arisme at users.sourceforge.net
Sun Aug 4 14:53:02 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv30269

Modified Files:
	gui.cpp 
Log Message:
Better WinCE virtual keyboard management

Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- gui.cpp	4 Aug 2002 11:01:16 -0000	1.66
+++ gui.cpp	4 Aug 2002 21:52:40 -0000	1.67
@@ -36,12 +36,16 @@
 // Additional variables for WinCE specific GUI
 #include "gapi_keys.h"
 extern bool toolbar_drawn;
+extern bool hide_toolbar;
 extern bool draw_keyboard;
 extern bool get_key_mapping;
 extern struct keyops keyMapping;
 extern void save_key_mapping(void);
+extern void do_hide(bool);
 uint16 _key_mapping_required;
 uint16 _current_page;
+bool keyboard_override;
+bool save_hide_toolbar;
 #else
 #define save_key_mapping() ;
 bool get_key_mapping;
@@ -1111,7 +1115,12 @@
 #ifdef _WIN32_WCE
 
 	// Option dialog can be accessed from the file dialog now, always check
-	if (draw_keyboard) {
+	if (save_hide_toolbar) {
+		do_hide(true);
+		save_hide_toolbar = false;
+	}
+	if (keyboard_override) {
+		keyboard_override = false;
 		draw_keyboard = false;
 		toolbar_drawn = false;
 	}
@@ -1151,6 +1160,20 @@
 	_active = true;
 	_cur_page = 0;
 	_dialog = SAVELOAD_DIALOG;
+
+#ifdef _WIN32_WCE
+	save_hide_toolbar = hide_toolbar;
+	if (save_hide_toolbar) {
+		// Display the keyboard while the dialog is running
+		do_hide(false);
+	}
+	if (!draw_keyboard) {
+		keyboard_override = true;
+		draw_keyboard = true;
+		toolbar_drawn = false;
+	}
+#endif
+
 }
 
 void Gui::pause()





More information about the Scummvm-git-logs mailing list