From 874a0b0e2f53a40427f9fe76faadd47c7edbb686 Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Sat, 5 Aug 2023 15:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=83=E7=B4=A0=E5=B1=8F=E5=B9=95=E5=9D=90?=
 =?UTF-8?q?=E6=A0=87=E4=B9=98=E4=BB=A5=E5=83=8F=E7=B4=A0=E6=AF=94=EF=BC=9B?=
 =?UTF-8?q?new=5Ftab()=E9=BB=98=E8=AE=A4=E4=B8=8D=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/chromium_element.py | 9 ++++++---
 DrissionPage/chromium_page.py    | 2 +-
 DrissionPage/chromium_page.pyi   | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/DrissionPage/chromium_element.py b/DrissionPage/chromium_element.py
index e76ad7a..929310a 100644
--- a/DrissionPage/chromium_element.py
+++ b/DrissionPage/chromium_element.py
@@ -1535,21 +1535,24 @@ class Locations(object):
         """返回元素左上角在屏幕上坐标，左上角为(0, 0)"""
         vx, vy = self._ele.page.rect.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
     def screen_midpoint(self):
         """返回元素中点在屏幕上坐标，左上角为(0, 0)"""
         vx, vy = self._ele.page.rect.viewport_location
         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
     def screen_click_point(self):
         """返回元素中点在屏幕上坐标，左上角为(0, 0)"""
         vx, vy = self._ele.page.rect.viewport_location
         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):
         """按照类型返回在可视窗口中的范围
diff --git a/DrissionPage/chromium_page.py b/DrissionPage/chromium_page.py
index b66a801..6b9ff62 100644
--- a/DrissionPage/chromium_page.py
+++ b/DrissionPage/chromium_page.py
@@ -214,7 +214,7 @@ class ChromiumPage(ChromiumBase):
                                  and (tab_type is None or i['type'] in tab_type))]
         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 switch_to: 新建标签页后是否把焦点移过去
diff --git a/DrissionPage/chromium_page.pyi b/DrissionPage/chromium_page.pyi
index b6d7023..5fde86a 100644
--- a/DrissionPage/chromium_page.pyi
+++ b/DrissionPage/chromium_page.pyi
@@ -84,7 +84,7 @@ class ChromiumPage(ChromiumBase):
     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]]: ...
 
-    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: ...