Changeset 246:bf4298ec3d46 for src/mlx

Timestamp:

06/12/12 18:14:19 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Fixed the problem with the main window not being responsive to keystrokes after showing after being hidden by minimization

Location:

src/mlx/gui

Files:

• common.py (modified) (2 diffs)
• gui.py (modified) (4 diffs)

src/mlx/gui/common.py

@@ -59 +59 @@
 
     WEIGHT_BOLD = pango.WEIGHT_BOLD
+
+    WINDOW_STATE_ICONIFIED = gdk.WINDOW_STATE_ICONIFIED
+    WINDOW_STATE_WITHDRAWN = gdk.WINDOW_STATE_WITHDRAWN
 
     pixbuf_new_from_file = gdk.pixbuf_new_from_file
@@ -112 +115 @@
     WEIGHT_BOLD = pango.Weight.BOLD
 
+    WINDOW_STATE_ICONIFIED = gdk.WindowState.ICONIFIED
+    WINDOW_STATE_WITHDRAWN = gdk.WindowState.WITHDRAWN
+
     pixbuf_new_from_file = gdkPixbuf.Pixbuf.new_from_file
 

src/mlx/gui/gui.py

@@ -544 +544 @@
         iconified = gdk.WindowState.ICONIFIED if pygobject \
                     else gdk.WINDOW_STATE_ICONIFIED
-        if self.config.hideMinimizedWindow and \
-           (event.changed_mask&iconified)!=0 and \
-           (event.new_window_state&iconified)!=0:
+
+        if (event.changed_mask&WINDOW_STATE_WITHDRAWN)!=0:
+            if (event.new_window_state&WINDOW_STATE_WITHDRAWN)!=0:
+                self._statusIcon.mainWindowHidden()
+            else:
+                self._statusIcon.mainWindowShown()
+
+        if self.config.hideMinimizedWindow and not pygobject and \
+           (event.changed_mask&WINDOW_STATE_ICONIFIED)!=0 and \
+           (event.new_window_state&WINDOW_STATE_ICONIFIED)!=0:
             self.hideMainWindow(savePosition = False)
-
+        elif (event.changed_mask&WINDOW_STATE_ICONIFIED)!=0 and \
+             (event.new_window_state&WINDOW_STATE_ICONIFIED)==0:
+            self._mainWindow.present()
+            
     def raiseCallback(self):
         """Callback for the singleton handling code."""
@@ -554 +564 @@
 
     def raiseMainWindow(self):
-        """SHow the main window if invisible, and raise it."""
+        """Show the main window if invisible, and raise it."""
         if not self._mainWindow.get_visible():
             self.showMainWindow()
@@ -567 +577 @@
             self._mainWindowX = self._mainWindowY = None
         self._mainWindow.hide()
-        self._statusIcon.mainWindowHidden()
         return True
 
@@ -575 +584 @@
             self._mainWindow.move(self._mainWindowX, self._mainWindowY)
 
-        self._mainWindow.show()
+        if pygobject:
+            self._mainWindow.show()
+        else:
+            self._mainWindow.present()
         self._mainWindow.deiconify()
             
-        self._statusIcon.mainWindowShown()
-
     def toggleMainWindow(self):
         """Toggle the main window."""