blackteay/DrissionPage
1
0
Fork 0
mirror of https://gitee.com/g1879/DrissionPage.git synced 2024-12-10 04:00:23 +08:00
Code Issues Projects Releases Wiki Activity

元素屏幕坐标乘以像素比；new_tab()默认不切换

Browse Source
This commit is contained in:
g1879 2023-08-05 15:34:49 +08:00
parent 3a416ec061
commit 874a0b0e2f
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DrissionPage/chromium_element.py
View File

@ -1535,21 +1535,24 @@ class Locations(object):
"""返回元素左上角在屏幕上坐标，左上角为(0, 0)""" """返回元素左上角在屏幕上坐标，左上角为(0, 0)"""
vx, vy = self._ele.page.rect.viewport_location vx, vy = self._ele.page.rect.viewport_location
ex, ey = self.viewport_location ex, ey = self.viewport_location
return vx + ex, ey + vy pr = self._ele.page.run_js('return window.devicePixelRatio;')
return int((vx + ex) * pr), int((ey + vy) * pr)
@property @property
def screen_midpoint(self): def screen_midpoint(self):
"""返回元素中点在屏幕上坐标，左上角为(0, 0)""" """返回元素中点在屏幕上坐标，左上角为(0, 0)"""
vx, vy = self._ele.page.rect.viewport_location vx, vy = self._ele.page.rect.viewport_location
ex, ey = self.viewport_midpoint ex, ey = self.viewport_midpoint
return vx + ex, ey + vy pr = self._ele.page.run_js('return window.devicePixelRatio;')
return int((vx + ex) * pr), int((ey + vy) * pr)
@property @property
def screen_click_point(self): def screen_click_point(self):
"""返回元素中点在屏幕上坐标，左上角为(0, 0)""" """返回元素中点在屏幕上坐标，左上角为(0, 0)"""
vx, vy = self._ele.page.rect.viewport_location vx, vy = self._ele.page.rect.viewport_location
ex, ey = self.viewport_click_point ex, ey = self.viewport_click_point
return vx + ex, ey + vy pr = self._ele.page.run_js('return window.devicePixelRatio;')
return int((vx + ex) * pr), int((ey + vy) * pr)
def _get_viewport_rect(self, quad): def _get_viewport_rect(self, quad):
"""按照类型返回在可视窗口中的范围 """按照类型返回在可视窗口中的范围

2
DrissionPage/chromium_page.py
View File

@ -214,7 +214,7 @@ class ChromiumPage(ChromiumBase):
and (tab_type is None or i['type'] in tab_type))] and (tab_type is None or i['type'] in tab_type))]
return r[0]['id'] if r and single else r return r[0]['id'] if r and single else r
def new_tab(self, url=None, switch_to=True): def new_tab(self, url=None, switch_to=False):
"""新建一个标签页,该标签页在最后面 """新建一个标签页,该标签页在最后面
:param url: 新标签页跳转到的网址 :param url: 新标签页跳转到的网址
:param switch_to: 新建标签页后是否把焦点移过去 :param switch_to: 新建标签页后是否把焦点移过去

2
DrissionPage/chromium_page.pyi
View File

@ -84,7 +84,7 @@ class ChromiumPage(ChromiumBase):
def find_tabs(self, title: str = None, url: str = None, def find_tabs(self, title: str = None, url: str = None,
tab_type: Union[str, list, tuple, set] = None, single: bool = True) -> Union[str, List[str]]: ... tab_type: Union[str, list, tuple, set] = None, single: bool = True) -> Union[str, List[str]]: ...
def new_tab(self, url: str = None, switch_to: bool = True) -> str: ... def new_tab(self, url: str = None, switch_to: bool = False) -> str: ...
def to_main_tab(self) -> None: ... def to_main_tab(self) -> None: ...