From 7f11da1bf5d3b8e3961b3f3763640998679d13d0 Mon Sep 17 00:00:00 2001 From: ILJEUN Date: Sun, 28 Aug 2022 22:59:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9Auia=E6=8E=A7=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81AutomationId=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qt4c/uiacontrols.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qt4c/uiacontrols.py b/qt4c/uiacontrols.py index 2635aed..d7c42fe 100644 --- a/qt4c/uiacontrols.py +++ b/qt4c/uiacontrols.py @@ -331,7 +331,13 @@ def HasKeyboardFocus(self): def ClassName(self): """返回ClassName """ - return self._uiaobj.CurrentClassName + return self._uiaobj.CurrentClassName + + @property + def AutomationId(self): + """返回AutomationId + """ + return self._uiaobj.CurrentAutomationId From ccd920792accb39533f95e9594fca3ac2f33b200 Mon Sep 17 00:00:00 2001 From: ILJEUN Date: Sun, 28 Aug 2022 02:54:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E5=9B=9E=E6=BB=9A=E6=8F=90?= =?UTF-8?q?=E4=BA=A4[cbbe4e3]=E4=B8=AD=E5=AF=B9DPI=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=86=85=E5=AE=B9=EF=BC=8C=E4=BF=AE=E5=A4=8Duia?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E5=9C=A8=E9=AB=98DPI=E4=B8=8B=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=8E=A7=E4=BB=B6=E4=B8=8D=E5=87=86=E7=A1=AE=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E5=81=8F=E7=A7=BB=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qt4c/mouse.py | 9 --------- qt4c/wincontrols.py | 5 +---- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/qt4c/mouse.py b/qt4c/mouse.py index 419bf14..94d41a8 100644 --- a/qt4c/mouse.py +++ b/qt4c/mouse.py @@ -15,8 +15,6 @@ import winerror import time -from . import util - class MouseFlag(object): '''鼠标按键枚举类 ''' @@ -65,12 +63,6 @@ class Mouse(object): _last_click_time = time.time() - @staticmethod - def handle_position(x, y): - """坐标转换""" - scale = util.getDpi() - return int(x / scale), int(y / scale) - @staticmethod def click(x, y, flag=MouseFlag.LeftButton, clicktype=MouseClickType.SingleClick): @@ -85,7 +77,6 @@ def click(x, y, flag=MouseFlag.LeftButton, :param clickType: 鼠标动作,如双击还是单击 :type clickType: qt4c.mouse.MouseClickType """ - x, y = Mouse.handle_position(x, y) win32api.SetCursorPos((x,y)) win32api.mouse_event(_mouse_msg[flag][0] | _mouse_msg[flag][1],0,0,0,0) if clicktype != MouseClickType.SingleClick: diff --git a/qt4c/wincontrols.py b/qt4c/wincontrols.py index 53baaf2..67f61bc 100644 --- a/qt4c/wincontrols.py +++ b/qt4c/wincontrols.py @@ -179,10 +179,7 @@ def BoundingRect(self): :rtype: util.Rectangle :return: util.Rectangle实例 """ - scale = util.getDpi() - rect = win32gui.GetWindowRect(self.HWnd) - rect = [it * scale for it in rect] - return util.Rectangle(rect) + return util.Rectangle(win32gui.GetWindowRect(self.HWnd)) @property def Caption(self):