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/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 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):