Merged remote changes.

Tue, 10 Apr 2012 18:51:43 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 10 Apr 2012 18:51:43 +0200
changeset 1779
98c1967118a7
parent 1778
31e70a6f8e7f (current diff)
parent 1776
6198675d24ea (diff)
child 1780
f42757fd021b

Merged remote changes.

Snapshot/SnapWidget.py file | annotate | diff | comparison | revisions
--- a/Snapshot/SnapWidget.py	Tue Apr 10 18:50:43 2012 +0200
+++ b/Snapshot/SnapWidget.py	Tue Apr 10 18:51:43 2012 +0200
@@ -28,6 +28,7 @@
 
 import UI.PixmapCache
 import Preferences
+import Globals
 
 
 class SnapWidget(QWidget, Ui_SnapWidget):
@@ -312,8 +313,11 @@
         elif self.__mode == SnapWidget.ModeFreehand:
             self.__grabFreehand()
         else:
-            self.__grabberWidget.show()
-            self.__grabberWidget.grabMouse(Qt.CrossCursor)
+            if Globals.isMacPlatform():
+                self.__performGrab()
+            else:
+                self.__grabberWidget.show()
+                self.__grabberWidget.grabMouse(Qt.CrossCursor)
     
     def __grabRectangle(self):
         """
@@ -372,6 +376,7 @@
         if not self.__savedPosition.isNull():
             self.move(self.__savedPosition)
         self.show()
+        self.raise_()
         
         self.saveButton.setEnabled(not self.__snapshot.isNull())
         self.copyButton.setEnabled(not self.__snapshot.isNull())
--- a/Utilities/Startup.py	Tue Apr 10 18:50:43 2012 +0200
+++ b/Utilities/Startup.py	Tue Apr 10 18:51:43 2012 +0200
@@ -243,5 +243,6 @@
     if quitOnLastWindowClosed:
         app.lastWindowClosed.connect(app.quit)
     w.show()
+    w.raise_()
     
     return app.exec_()

eric ide

mercurial