From 3612fe13e712b55f91ba5a8cdce847311b9aa028 Mon Sep 17 00:00:00 2001 From: g1879 Date: Fri, 24 Feb 2023 20:37:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=92=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E7=AA=97=E5=8F=A3=E7=A7=BB=E5=88=B0?= =?UTF-8?q?set.window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DrissionPage/chromium_page.py | 26 ++++++++++++++++++-------- DrissionPage/chromium_page.pyi | 8 ++++---- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/DrissionPage/chromium_page.py b/DrissionPage/chromium_page.py index 43c443e..0f325ed 100644 --- a/DrissionPage/chromium_page.py +++ b/DrissionPage/chromium_page.py @@ -324,14 +324,6 @@ class ChromiumPage(ChromiumBase): self.driver.Page.handleJavaScriptDialog(accept=accept) return res_text - def hide_browser(self): - """隐藏浏览器窗口,只在Windows系统可用""" - show_or_hide_browser(self, hide=True) - - def show_browser(self): - """显示浏览器窗口,只在Windows系统可用""" - show_or_hide_browser(self, hide=False) - def quit(self): """关闭浏览器""" self._tab_obj.Browser.close() @@ -380,6 +372,16 @@ class ChromiumPage(ChromiumBase): warn("wait_download_begin()方法即将弃用,请用wait.download_begin()方法代替。", DeprecationWarning) return self.download_set.wait_download_begin(timeout) + def hide_browser(self): + """隐藏浏览器窗口,只在Windows系统可用""" + warn("hide_browser()方法即将弃用,请用set.hide()方法代替。", DeprecationWarning) + show_or_hide_browser(self, hide=True) + + def show_browser(self): + """显示浏览器窗口,只在Windows系统可用""" + warn("show_browser()方法即将弃用,请用set.show()方法代替。", DeprecationWarning) + show_or_hide_browser(self, hide=False) + class ChromiumPageWaiter(ChromiumBaseWaiter): def download_begin(self, timeout=None): @@ -655,6 +657,14 @@ class WindowSetter(object): y = y if y is not None else info['top'] self._perform({'left': x - 8, 'top': y}) + def hide(self): + """隐藏浏览器窗口,只在Windows系统可用""" + show_or_hide_browser(self._page, hide=True) + + def show(self): + """显示浏览器窗口,只在Windows系统可用""" + show_or_hide_browser(self._page, hide=False) + def _get_info(self): """获取窗口位置及大小信息""" return self._page.run_cdp('Browser.getWindowForTarget') diff --git a/DrissionPage/chromium_page.pyi b/DrissionPage/chromium_page.pyi index 4e4b994..024bcd3 100644 --- a/DrissionPage/chromium_page.pyi +++ b/DrissionPage/chromium_page.pyi @@ -97,10 +97,6 @@ class ChromiumPage(ChromiumBase): def handle_alert(self, accept: bool = True, send: str = None, timeout: float = None) -> Union[str, None]: ... - def hide_browser(self) -> None: ... - - def show_browser(self) -> None: ... - def quit(self) -> None: ... def _on_alert_close(self, **kwargs): ... @@ -205,6 +201,10 @@ class WindowSetter(object): def location(self, x: int = None, y: int = None) -> None: ... + def hide(self) -> None: ... + + def show(self) -> None: ... + def _get_info(self) -> dict: ... def _perform(self, bounds: dict) -> None: ...