Merge pull request pywinauto#319 from vasily-v-ryabov/UIA

Fix pywinauto#318
Manoharsai · Feb 26, 2017 · 86070c6 · 86070c6
2 parents 6ec4b5b + 0deb748
commit 86070c6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/pywinauto/controls/hwndwrapper.py b/pywinauto/controls/hwndwrapper.py
@@ -1174,7 +1174,10 @@ def set_focus(self):
             mouse.move(coords=(-10000, 500))  # move the mouse out of screen to the left
 
             # change active window
-            win32gui.ShowWindow(self.handle, win32con.SW_RESTORE)
+            if self.is_minimized():
+                win32gui.ShowWindow(self.handle, win32con.SW_RESTORE)
+            else:
+                win32gui.ShowWindow(self.handle, win32con.SW_SHOW)
             win32gui.SetForegroundWindow(self.handle)
 
             # make sure that we are idle before returning

diff --git a/pywinauto/unittests/test_hwndwrapper.py b/pywinauto/unittests/test_hwndwrapper.py
@@ -475,6 +475,20 @@ def testGetFocus(self):
         self.dlg.Set.set_focus()
         self.assertEqual(self.dlg.GetFocus(), self.dlg.Set.handle)
 
+    def test_issue_318(self):
+        self.dlg.restore()
+        self.dlg.minimize()
+        self.dlg.set_focus()
+        self.assertTrue(self.dlg.is_normal())
+        self.assertTrue(self.dlg.is_active())
+
+        self.dlg.maximize()
+        self.dlg.minimize()
+        self.dlg.set_focus()
+        self.assertTrue(self.dlg.is_maximized())
+        self.assertTrue(self.dlg.is_active())
+        self.dlg.restore()
+
     def testSetFocus(self):
         self.assertNotEqual(self.dlg.GetFocus(), self.dlg.Set.handle)
         self.dlg.Set.set_focus()