pyloid 0.11.5__tar.gz → 0.12.1__tar.gz

{pyloid-0.11.5 → pyloid-0.12.1}/LICENSE

@@ -198,4 +198,4 @@ Apache License
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

{pyloid-0.11.5 → pyloid-0.12.1}/PKG-INFO

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

{pyloid-0.11.5 → pyloid-0.12.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyloid"
-version = "0.11.5"
+version = "0.12.1"
 description = ""
 authors = ["aesthetics-of-record <111675679+aesthetics-of-record@users.noreply.github.com>"]
 readme = "README.md"

pyloid-0.12.1/src/pyloid/custom/titlebar.py

@@ -0,0 +1,116 @@
+from PySide6.QtWidgets import (
+    QWidget,
+    QHBoxLayout,
+    QLabel,
+    QPushButton,
+    QVBoxLayout,
+    QApplication,
+)
+from PySide6.QtGui import QColor, QPalette, QPixmap
+from PySide6.QtCore import Qt
+
+
+class CustomTitleBar(QWidget):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.layout = QHBoxLayout(self)
+        self.layout.setContentsMargins(5, 0, 5, 0)
+        self.layout.setSpacing(0)
+
+        self.icon_label = QLabel()
+        self.icon_label.setFixedSize(20, 20)
+        self.title = QLabel("Custom Title")
+
+        self.minimize_button = QPushButton("－")
+        self.maximize_button = QPushButton("❐")
+        self.close_button = QPushButton("×")
+
+        for button in (self.minimize_button, self.maximize_button, self.close_button):
+            button.setFixedSize(45, 30)
+            button.setFlat(True)
+
+        self.layout.addWidget(self.icon_label)
+        self.layout.addSpacing(5)
+        self.layout.addWidget(self.title)
+        self.layout.addStretch(1)
+        self.layout.addWidget(self.minimize_button)
+        self.layout.addWidget(self.maximize_button)
+        self.layout.addWidget(self.close_button)
+
+        self.minimize_button.clicked.connect(self.window().showMinimized)
+        self.maximize_button.clicked.connect(self.toggle_maximize)
+        self.close_button.clicked.connect(self.window().close)
+
+        self.setFixedHeight(30)
+        self.set_style("darkblue", "white")
+
+    def set_style(self, bg_color, text_color):
+        self.setAutoFillBackground(True)
+        palette = self.palette()
+        bg_qcolor = QColor(bg_color)
+        text_qcolor = QColor(text_color)
+        palette.setColor(QPalette.Window, bg_qcolor)
+        palette.setColor(QPalette.WindowText, text_qcolor)
+        self.setPalette(palette)
+
+        self.title.setStyleSheet(f"color: {text_color}; font-weight: bold;")
+
+        button_style = f"""
+            QPushButton {{
+                background-color: {bg_color};
+                color: {text_color};
+                border: none;
+                font-family: Arial;
+                font-size: 14px;
+                padding: 0px;
+                text-align: center;
+            }}
+            QPushButton:hover {{
+                background-color: {bg_qcolor.lighter(120).name()};
+            }}
+            QPushButton:pressed {{
+                background-color: {bg_qcolor.darker(110).name()};
+            }}
+        """
+        for button in (self.minimize_button, self.maximize_button, self.close_button):
+            button.setStyleSheet(button_style)
+
+        self.close_button.setStyleSheet(
+            button_style
+            + f"""
+            QPushButton:hover {{
+                background-color: #e81123;
+                color: white;
+            }}
+        """
+        )
+
+    def mousePressEvent(self, event):
+        if event.button() == Qt.LeftButton:
+            self.window().moving = True
+            self.window().offset = event.pos()
+
+    def mouseMoveEvent(self, event):
+        if self.window().moving:
+            self.window().move(event.globalPos() - self.window().offset)
+
+    def mouseReleaseEvent(self, event):
+        if event.button() == Qt.LeftButton:
+            self.window().moving = False
+
+    def toggle_maximize(self):
+        if self.window().isMaximized():
+            self.window().showNormal()
+            self.maximize_button.setText("❐")
+        else:
+            self.window().showMaximized()
+            self.maximize_button.setText("❐")
+
+    def set_icon(self, icon_path):
+        pixmap = QPixmap(icon_path)
+        self.icon_label.setPixmap(
+            pixmap.scaled(20, 20, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+        )
+
+    def set_title(self, title):
+        self.title.setText(title)

{pyloid-0.11.5 → pyloid-0.12.1}/src/pyloid/pyloid.py

@@ -15,10 +15,9 @@ from PySide6.QtGui import (
     QClipboard,
     QImage,
     QAction,
-    QPalette,
-    QColor,
+    QCursor,
 )
-from PySide6.QtCore import Qt, Signal, QPoint, QUrl, QObject, QTimer, QSize
+from PySide6.QtCore import Qt, Signal, QPoint, QUrl, QObject, QTimer, QSize, QEvent
 from PySide6.QtNetwork import QLocalServer, QLocalSocket
 from PySide6.QtWebEngineCore import QWebEnginePage, QWebEngineSettings
 from .api import PyloidAPI, Bridge
@@ -32,9 +31,11 @@ import json
 from .autostart import AutoStart
 from .filewatcher import FileWatcher
 import logging
-from PySide6.QtGui import QPalette, QColor
-from PySide6.QtWidgets import QWidget, QVBoxLayout, QLabel, QPushButton, QHBoxLayout, QSizePolicy
-from PySide6.QtGui import QPixmap
+from PySide6.QtWidgets import (
+    QWidget,
+    QVBoxLayout,
+)
+from .custom.titlebar import CustomTitleBar
 
 # for linux debug
 os.environ["QTWEBENGINE_DICTIONARIES_PATH"] = "/"
@@ -189,39 +190,48 @@ class WindowAPI(PyloidAPI):
         """Returns whether the window has a frame."""
         window = self.app.get_window_by_id(self.window_id)
         return window.frame if window else False
-    
+
     @Bridge(result=bool)
     def getContextMenu(self):
         """Returns whether the window has a context menu."""
         window = self.app.get_window_by_id(self.window_id)
         return window.context_menu if window else False
-    
+
     @Bridge(result=bool)
     def getDevTools(self):
         """Returns whether the window has developer tools."""
         window = self.app.get_window_by_id(self.window_id)
         return window.dev_tools if window else False
-    
+
     @Bridge(result=str)
     def getTitle(self):
         """Returns the title of the window."""
         window = self.app.get_window_by_id(self.window_id)
         return window.title if window else ""
-    
+
     @Bridge(result=dict)
     def getSize(self):
         """Returns the size of the window."""
         window = self.app.get_window_by_id(self.window_id)
-        return {"width": window.width, "height": window.height} if window else {"width": 0, "height": 0}
-    
+        return (
+            {"width": window.width, "height": window.height}
+            if window
+            else {"width": 0, "height": 0}
+        )
+
     @Bridge(result=dict)
     def getPosition(self):
         """Returns the position of the window."""
         window = self.app.get_window_by_id(self.window_id)
         return {"x": window.x, "y": window.y} if window else {"x": 0, "y": 0}
-    
-    
-    
+
+    @Bridge()
+    def startSystemDrag(self):
+        """Starts the system drag."""
+        window = self.app.get_window_by_id(self.window_id)
+        if window:
+            window.web_view.start_system_drag()
+
 
 # class EventAPI(PylonAPI):
 #     def __init__(self, window_id: str, app):
@@ -245,105 +255,62 @@ class WindowAPI(PyloidAPI):
 #                 callback(*args, **kwargs)
 
 
-class CustomTitleBar(QWidget):
+# 어차피 load 부분에만 쓰이니까 나중에 분리해서 load 위에서 선언하자.
+class CustomWebEngineView(QWebEngineView):
     def __init__(self, parent=None):
-        super().__init__(parent)
-        self.layout = QHBoxLayout(self)
-        self.layout.setContentsMargins(5, 0, 5, 0)
-        self.layout.setSpacing(0)
-
-        self.icon_label = QLabel()
-        self.icon_label.setFixedSize(20, 20)
-        self.title = QLabel("Custom Title")
-        
-        self.minimize_button = QPushButton("－")
-        self.maximize_button = QPushButton("❐")
-        self.close_button = QPushButton("×")
-
-        for button in (self.minimize_button, self.maximize_button, self.close_button):
-            button.setFixedSize(45, 30)
-            button.setFlat(True)
-
-        self.layout.addWidget(self.icon_label)
-        self.layout.addSpacing(5)
-        self.layout.addWidget(self.title)
-        self.layout.addStretch(1)
-        self.layout.addWidget(self.minimize_button)
-        self.layout.addWidget(self.maximize_button)
-        self.layout.addWidget(self.close_button)
-
-        self.minimize_button.clicked.connect(self.window().showMinimized)
-        self.maximize_button.clicked.connect(self.toggle_maximize)
-        self.close_button.clicked.connect(self.window().close)
-
-        self.setFixedHeight(30)
-        self.set_style("darkblue", "white")
-
-    def set_style(self, bg_color, text_color):
-        self.setAutoFillBackground(True)
-        palette = self.palette()
-        bg_qcolor = QColor(bg_color)
-        text_qcolor = QColor(text_color)
-        palette.setColor(QPalette.Window, bg_qcolor)
-        palette.setColor(QPalette.WindowText, text_qcolor)
-        self.setPalette(palette)
-
-        self.title.setStyleSheet(f"color: {text_color}; font-weight: bold;")
-
-        button_style = f"""
-            QPushButton {{
-                background-color: {bg_color};
-                color: {text_color};
-                border: none;
-                font-family: Arial;
-                font-size: 14px;
-                padding: 0px;
-                text-align: center;
-            }}
-            QPushButton:hover {{
-                background-color: {bg_qcolor.lighter(120).name()};
-            }}
-            QPushButton:pressed {{
-                background-color: {bg_qcolor.darker(110).name()};
-            }}
-        """
-        for button in (self.minimize_button, self.maximize_button, self.close_button):
-            button.setStyleSheet(button_style)
-
-        self.close_button.setStyleSheet(button_style + f"""
-            QPushButton:hover {{
-                background-color: #e81123;
-                color: white;
-            }}
-        """)
-
-    def mousePressEvent(self, event):
+        super().__init__(parent._window)
+        self.parent = parent
+        self.drag_relative_position = None
+        self.is_dragging = False
+        self.screen_geometry = self.screen().availableGeometry()
+
+    def mouse_press_event(self, event):
         if event.button() == Qt.LeftButton:
-            self.window().moving = True
-            self.window().offset = event.pos()
+            self.drag_relative_position = event.pos()
+
+    def start_system_drag(self):
+        self.is_dragging = True
+
+    def mouse_move_event(self, event):
+        if not self.parent.frame and self.is_dragging:
+            # 현재 마우스 위치를 전역 좌표로 가져옵니다
+            current_global_pos = event.globalPos()
+
+            # 화면 경계를 계산합니다
+            left_boundary = self.screen_geometry.left()
+            right_boundary = self.screen_geometry.right()
+            top_boundary = self.screen_geometry.top()
+            bottom_boundary = self.screen_geometry.bottom()
+
+            # 마우스 커서 위치를 제한합니다
+            new_cursor_pos = QPoint(
+                max(left_boundary, min(current_global_pos.x(), right_boundary)),
+                max(top_boundary, min(current_global_pos.y(), bottom_boundary)),
+            )
 
-    def mouseMoveEvent(self, event):
-        if self.window().moving:
-            self.window().move(event.globalPos() - self.window().offset)
+            # 마우스 커서를 새 위치로 이동합니다
+            QCursor.setPos(new_cursor_pos)
 
-    def mouseReleaseEvent(self, event):
-        if event.button() == Qt.LeftButton:
-            self.window().moving = False
+            # 창의 새 위치를 계산합니다
+            new_window_pos = new_cursor_pos - self.drag_relative_position
 
-    def toggle_maximize(self):
-        if self.window().isMaximized():
-            self.window().showNormal()
-            self.maximize_button.setText("❐")
-        else:
-            self.window().showMaximized()
-            self.maximize_button.setText("❐")
+            # 창을 새 위치로 이동합니다
+            self.parent._window.move(new_window_pos)
 
-    def set_icon(self, icon_path):
-        pixmap = QPixmap(icon_path)
-        self.icon_label.setPixmap(pixmap.scaled(20, 20, Qt.KeepAspectRatio, Qt.SmoothTransformation))
+    def mouse_release_event(self, event):
+        if event.button() == Qt.LeftButton:
+            self.is_dragging = False
+
+    def eventFilter(self, source, event):
+        if self.focusProxy() is source:
+            if event.type() == QEvent.MouseButtonPress:
+                self.mouse_press_event(event)
+            elif event.type() == QEvent.MouseMove:
+                self.mouse_move_event(event)
+            elif event.type() == QEvent.MouseButtonRelease:
+                self.mouse_release_event(event)
+        return super().eventFilter(source, event)
 
-    def set_title(self, title):
-        self.title.setText(title)
 
 class BrowserWindow:
     def __init__(
@@ -361,9 +328,8 @@ class BrowserWindow:
     ):
         ###########################################################################################
         self.id = str(uuid.uuid4())  # Generate unique ID
-
         self._window = QMainWindow()
-        self.web_view = QWebEngineView()
+        self.web_view = CustomWebEngineView(self)
 
         self._window.closeEvent = self.closeEvent  # Override closeEvent method
         ###########################################################################################
@@ -382,28 +348,35 @@ class BrowserWindow:
         self.shortcuts = {}
         ###########################################################################################
 
-    def set_custom_frame(self, use_custom: bool, title: str = "Custom Title", bg_color: str = "darkblue", text_color: str = "white", icon_path: str = None):
-        """커스텀 프레임을 설정하거나 제거합니다."""
+    def _set_custom_frame(
+        self,
+        use_custom: bool,
+        title: str = "Custom Title",
+        bg_color: str = "darkblue",
+        text_color: str = "white",
+        icon_path: str = None,
+    ):
+        """Sets or removes the custom frame."""
         if use_custom:
             self._window.setWindowFlags(Qt.FramelessWindowHint)
             self.custom_title_bar = CustomTitleBar(self._window)
             self.custom_title_bar.set_style(bg_color, text_color)
             self.custom_title_bar.set_title(title)
-            
+
             if icon_path:
                 self.custom_title_bar.set_icon(icon_path)
-            
+
             layout = QVBoxLayout()
             layout.setContentsMargins(0, 0, 0, 0)
             layout.setSpacing(0)
             layout.addWidget(self.custom_title_bar)
             layout.addWidget(self.web_view)
-            
+
             central_widget = QWidget()
             central_widget.setLayout(layout)
             self._window.setCentralWidget(central_widget)
 
-            # 창 이동을 위한 속성 추가
+            # Add properties for window movement
             self._window.moving = False
             self._window.offset = QPoint()
         else:
@@ -414,9 +387,10 @@ class BrowserWindow:
         self._window.show()
 
     def _load(self):
-        self._window.setWindowTitle(self.title)
+        self.set_title(self.title)
 
-        self._window.setGeometry(self.x, self.y, self.width, self.height)
+        self.set_size(self.width, self.height)
+        self.set_position(self.x, self.y)
 
         # allow local file access to remote urls
         self.web_view.settings().setAttribute(
@@ -490,6 +464,12 @@ class BrowserWindow:
                     console.log('pyloid.EventAPI object initialized:', window.pyloid.EventAPI);
 
                     %s
+                    
+                    document.addEventListener('mousedown', function (e) {
+                        if (e.target.hasAttribute('data-pyloid-drag-region')) {
+                            window.pyloid.WindowAPI.startSystemDrag();
+                        }
+                    });
 
                     // Dispatch a custom event to signal that the initialization is ready
                     const event = new CustomEvent('pyloidReady');
@@ -518,11 +498,13 @@ class BrowserWindow:
         self._load()
         file_path = os.path.abspath(file_path)  # absolute path
         self.web_view.setUrl(QUrl.fromLocalFile(file_path))
+        self.web_view.focusProxy().installEventFilter(self.web_view)
 
     def load_url(self, url):
         """Sets the URL of the window."""
         self._load()
         self.web_view.setUrl(QUrl(url))
+        self.web_view.focusProxy().installEventFilter(self.web_view)
 
     ###########################################################################################
     # Set Parameters
@@ -735,6 +717,7 @@ class BrowserWindow:
         }})();
         """
         self.web_view.page().runJavaScript(script)
+
     ###########################################################################################
     # Get Properties
     ###########################################################################################
@@ -755,7 +738,7 @@ class BrowserWindow:
     def get_id(self):
         """Returns the ID of the window."""
         return self.id
-    
+
     def get_size(self) -> Dict[str, int]:
         """Returns the size of the window."""
         return {"width": self.width, "height": self.height}
@@ -763,7 +746,7 @@ class BrowserWindow:
     def get_position(self) -> Dict[str, int]:
         """Returns the position of the window."""
         return {"x": self.x, "y": self.y}
-    
+
     def get_title(self) -> str:
         """Returns the title of the window."""
         return self.title
@@ -771,7 +754,7 @@ class BrowserWindow:
     def get_url(self) -> str:
         """Returns the URL of the window."""
         return self.web_view.url().toString()
-    
+
     def get_visible(self) -> bool:
         """Returns the visibility of the window."""
         return self._window.isVisible()
@@ -780,11 +763,15 @@ class BrowserWindow:
         """창의 크기 조절 가능 여부를 설정합니다."""
         self.resizable = resizable
         if resizable:
-            self._window.setWindowFlags(self._window.windowFlags() & ~Qt.MSWindowsFixedSizeDialogHint)
+            self._window.setWindowFlags(
+                self._window.windowFlags() & ~Qt.MSWindowsFixedSizeDialogHint
+            )
         else:
-            self._window.setWindowFlags(self._window.windowFlags() | Qt.MSWindowsFixedSizeDialogHint)
+            self._window.setWindowFlags(
+                self._window.windowFlags() | Qt.MSWindowsFixedSizeDialogHint
+            )
         self._window.show()  # 변경사항을 적용하기 위해 창을 다시 표시합니다.
-    
+
 
 class _WindowController(QObject):
     create_window_signal = Signal(
@@ -822,7 +809,7 @@ class Pyloid(QApplication):
 
         self.app_name = app_name
         self.app_path = sys.executable
-        
+
         self.auto_start = AutoStart(self.app_name, self.app_path)
 
         self.animation_timer = None