pyloid 0.17.2__py3-none-any.whl → 0.17.4__py3-none-any.whl

pyloid/api.py

@@ -1,4 +1,9 @@
 from PySide6.QtCore import QObject, Slot
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from pyloid.pyloid import Pyloid
+    from pyloid.browser_window import BrowserWindow
 
 
 class PyloidAPI(QObject):
@@ -45,6 +50,9 @@ class PyloidAPI(QObject):
 
     def __init__(self):
         super().__init__()
+        self.window_id: str = None
+        self.window: "BrowserWindow" = None
+        self.app: "Pyloid" = None
 
 
 def Bridge(*args, **kwargs):

pyloid/browser_window.py

@@ -72,7 +72,7 @@ class CustomWebEngineView(QWebEngineView):
         super().__init__(parent._window)
         self.parent: "BrowserWindow" = parent
 
-        # 커스텀 웹 페이지 설정
+        # Custom Web Page
         self.custom_page = CustomWebPage()
         self.setPage(self.custom_page)
 
@@ -81,36 +81,63 @@ class CustomWebEngineView(QWebEngineView):
         self.resize_direction = None
         self.screen_geometry = self.screen().virtualGeometry()
         self.is_resizing_enabled = True
+        
+        self.setAttribute(Qt.WA_SetCursor, False)
+        
+        self.is_in_resize_area = False
 
     def mouse_press_event(self, event):
+        if self.parent.frame or not self.is_resizing_enabled:
+            return
+        
         if event.button() == Qt.LeftButton:
-            if not self.parent.frame and self.is_resizing_enabled:
-                self.resize_direction = self.get_resize_direction(event.pos())
-                if self.resize_direction:
-                    self.is_resizing = True
-                    self.resize_start_pos = event.globalPos()
+            self.resize_direction = self.get_resize_direction(event.pos())
+            if self.resize_direction:
+                self.is_resizing = True
+                self.resize_start_pos = event.globalPos()
 
     def start_system_drag(self):
-        """네이티브 시스템 창 이동 시작"""
+        """Start system window move"""
         if self.parent._window.windowHandle():
             self.parent._window.windowHandle().startSystemMove()
 
     def mouse_move_event(self, event):
-        if self.is_resizing and self.is_resizing_enabled:
+        if self.parent.frame or not self.is_resizing_enabled:
+            return
+        
+        # Check resize direction
+        was_in_resize_area = self.is_in_resize_area
+        resize_direction = self.get_resize_direction(event.pos())
+        self.is_in_resize_area = bool(resize_direction)
+        
+        if resize_direction and not self.is_resizing:
+            self.set_cursor_for_resize_direction(resize_direction)
+            
+        if self.is_resizing:
             self.resize_window(event.globalPos())
-        else:
-            # Change cursor based on resize direction
-            resize_direction = self.get_resize_direction(event.pos())
-            if resize_direction and self.is_resizing_enabled:
-                self.set_cursor_for_resize_direction(resize_direction)
+            return
+            
+        # Change cursor when entering/leaving resize area
+        if self.is_in_resize_area != was_in_resize_area:
+            if self.is_in_resize_area:
+                # self.setAttribute(Qt.WA_SetCursor, True)
+                pass
             else:
                 self.unsetCursor()
+                # self.setAttribute(Qt.WA_SetCursor, False)
 
     def mouse_release_event(self, event):
+        if self.parent.frame or not self.is_resizing_enabled:
+            return
+        
         if event.button() == Qt.LeftButton:
             self.is_resizing = False
-            self.resize_direction = None
-            self.unsetCursor()
+            
+            if self.resize_direction:
+                self.unsetCursor()     
+                self.resize_direction = None
+
+            self.setAttribute(Qt.WA_SetCursor, False)
 
     def eventFilter(self, source, event):
         if self.focusProxy() is source:
@@ -126,7 +153,7 @@ class CustomWebEngineView(QWebEngineView):
         if (
             not self.parent.frame and self.is_resizing_enabled
         ):  # Check if frame is not present and resizing is enabled
-            margin = 5  # Margin in pixels to detect edge
+            margin = 8  # Margin in pixels to detect edge
             rect = self.rect()
             direction = None
 
@@ -144,17 +171,20 @@ class CustomWebEngineView(QWebEngineView):
         return None
 
     def set_cursor_for_resize_direction(self, direction):
-        if (
-            not self.parent.frame and direction and self.is_resizing_enabled
-        ):  # Check if frame is not present and resizing is enabled
+        if not self.parent.frame and direction and self.is_resizing_enabled:
+            cursor = None
             if direction in ["left", "right"]:
-                self.setCursor(Qt.SizeHorCursor)
+                cursor = Qt.SizeHorCursor
             elif direction in ["top", "bottom"]:
-                self.setCursor(Qt.SizeVerCursor)
+                cursor = Qt.SizeVerCursor
             elif direction in ["left-top", "right-bottom"]:
-                self.setCursor(Qt.SizeFDiagCursor)
+                cursor = Qt.SizeFDiagCursor
             elif direction in ["right-top", "left-bottom"]:
-                self.setCursor(Qt.SizeBDiagCursor)
+                cursor = Qt.SizeBDiagCursor
+                
+            if cursor:
+                self.setCursor(cursor)
+                self.setAttribute(Qt.WA_SetCursor, True)
 
     def resize_window(self, global_pos):
         if (
@@ -209,7 +239,7 @@ class BrowserWindow:
         self.frame = frame
         self.context_menu = context_menu
         self.dev_tools = dev_tools
-        self.js_apis = [WindowAPI(self.id, self.app)]
+        self.js_apis = [WindowAPI()]
         for js_api in js_apis:
             self.js_apis.append(js_api)
         self.shortcuts = {}
@@ -344,6 +374,11 @@ class BrowserWindow:
         # Register additional JS APIs
         if self.js_apis:
             for js_api in self.js_apis:
+                # Define window_id, window, and app for each JS API
+                js_api.window_id = self.id
+                js_api.window = self
+                js_api.app = self.app
+                
                 self.channel.registerObject(js_api.__class__.__name__, js_api)
 
         self.web_view.page().setWebChannel(self.channel)
@@ -1856,7 +1891,7 @@ class BrowserWindow:
         Parameters
         ----------
         handler : callable
-            요청을 처리할 핸들러 함수. QWebEngineDesktopMediaRequest를 인자로 받습니다.
+            요청을 처리할 핸들러 함수. QWebEngineDesktopMediaRequest��� 인자로 받습니다.
             
         Examples
         --------

pyloid/js_api/window_api.py

@@ -8,10 +8,10 @@ if TYPE_CHECKING:
     from ..pyloid import Pyloid
 
 class WindowAPI(PyloidAPI):
-    def __init__(self, window_id: str, app: 'Pyloid'):
-        super().__init__()
-        self.window_id: str = window_id
-        self.app: 'Pyloid' = app
+    # def __init__(self, window_id: str, app: 'Pyloid'):
+    #     super().__init__()
+    #     self.window_id: str = window_id
+    #     self.app: 'Pyloid' = app
 
     @Bridge(result=str)
     def getWindowId(self):

{pyloid-0.17.2.dist-info → pyloid-0.17.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyloid
-Version: 0.17.2
+Version: 0.17.4
 Summary: 
 Author: aesthetics-of-record
 Author-email: 111675679+aesthetics-of-record@users.noreply.github.com

{pyloid-0.17.2.dist-info → pyloid-0.17.4.dist-info}/RECORD

@@ -1,18 +1,18 @@
 pyloid/__init__.py,sha256=OOPhOKNQVmAM8hnfTeE7lHzxb8LsFNcgegBAvDrA-vY,293
-pyloid/api.py,sha256=np0pFVUlen_GpN0svY0A3awY_ZjVFk-RpHQZZKFUMuo,2157
+pyloid/api.py,sha256=A61Kmddh8BlpT3LfA6NbPQNzFmD95vQ4WKX53oKsGYU,2419
 pyloid/autostart.py,sha256=K7DQYl4LHItvPp0bt1V9WwaaZmVSTeGvadkcwG-KKrI,3899
-pyloid/browser_window.py,sha256=BYjzcP6tPg-3Splai-v60-0LZ2gXeyk0QUrcy6rHydA,61946
+pyloid/browser_window.py,sha256=6Es-DH45URUV6rlCBWj3ZWwrXLMUvqp5700WlU8Sdwo,62984
 pyloid/custom/titlebar.py,sha256=itzK9pJbZMQ7BKca9kdbuHMffurrw15UijR6OU03Xsk,3894
 pyloid/filewatcher.py,sha256=3M5zWVUf1OhlkWJcDFC8ZA9agO4Q-U8WdgGpy6kaVz0,4601
 pyloid/js_api/event_api.py,sha256=_52yyBonqecmMvJpFW7OMNi_jX8Nrteqw_kI6r-DGG0,951
-pyloid/js_api/window_api.py,sha256=QutXXAOZkpYmytOYSenpzVSCl15-OFEjDDr75fHfLvk,8481
+pyloid/js_api/window_api.py,sha256=BsAO4VBkqfUPib4f7AHxaMRXvN3FvzMXDBsqSUAay3c,8489
 pyloid/monitor.py,sha256=1mXvHm5deohnNlTLcRx4sT4x-stnOIb0dUQnnxN50Uo,28295
 pyloid/pyloid.py,sha256=YKE2a5yZFbBZrtMND2X5I7CVnFRK40NFzDp3kYN-oQg,44091
 pyloid/thread_pool.py,sha256=fKOBb8jMfZn_7crA_fJCno8dObBRZE31EIWaNQ759aw,14616
 pyloid/timer.py,sha256=RqMsChFUd93cxMVgkHWiIKrci0QDTBgJSTULnAtYT8M,8712
 pyloid/tray.py,sha256=D12opVEc2wc2T4tK9epaN1oOdeziScsIVNM2uCN7C-A,1710
 pyloid/utils.py,sha256=XPM2PxO0LQ_eAnba5pKJ3vYsCev91JMFmv13EFuAy5o,2620
-pyloid-0.17.2.dist-info/LICENSE,sha256=F96EzotgWhhpnQTW2TcdoqrMDir1jyEo6H915tGQ-QE,11524
-pyloid-0.17.2.dist-info/METADATA,sha256=lJOqRUrgEu8dFENvWV7l2qH5w7oQVKD3RxHyr5zaNjM,3054
-pyloid-0.17.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyloid-0.17.2.dist-info/RECORD,,
+pyloid-0.17.4.dist-info/LICENSE,sha256=F96EzotgWhhpnQTW2TcdoqrMDir1jyEo6H915tGQ-QE,11524
+pyloid-0.17.4.dist-info/METADATA,sha256=bqZ7DTwKxdvSw2wurQBe5EiCCOa-vXEEW6gXYVrg3rY,3054
+pyloid-0.17.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyloid-0.17.4.dist-info/RECORD,,