fix(gui): resize mini chat only from corners

Author: cosven

feeluown/gui/uimain/mini_mode.py

@@ -267,7 +267,16 @@ def _show_context_menu(self, global_pos):
         menu.exec(global_pos)
 
     def _handle_drag_event(self, obj, event):
-        if self._is_interactive_drag_source(obj):
+        drag_active = (
+            self._drag_global_pos is not None or self._using_system_move
+        )
+        if self._is_interactive_drag_source(obj) and not (
+            drag_active
+            or (
+                self.isVisible()
+                and self._is_window_side(event.globalPosition().toPoint())
+            )
+        ):
             self._drag_global_pos = None
             self._using_system_move = False
             return False
@@ -316,7 +325,7 @@ def _handle_resize_event(self, _obj, event):
                 return True
             edges = self._resize_edges_at(global_pos)
             if edges is not None:
-                self.setCursor(Qt.CursorShape.SizeHorCursor)
+                self.setCursor(self._resize_cursor(edges))
             else:
                 self.unsetCursor()
             return False
@@ -346,12 +355,37 @@ def _handle_resize_event(self, _obj, event):
 
     def _resize_edges_at(self, global_pos):
         geometry = self.frameGeometry()
-        if global_pos.x() <= geometry.left() + RESIZE_MARGIN:
-            return Qt.Edge.LeftEdge
-        if global_pos.x() >= geometry.right() - RESIZE_MARGIN:
-            return Qt.Edge.RightEdge
+        left = global_pos.x() <= geometry.left() + RESIZE_MARGIN
+        right = global_pos.x() >= geometry.right() - RESIZE_MARGIN
+        top = global_pos.y() <= geometry.top() + RESIZE_MARGIN
+        bottom = global_pos.y() >= geometry.bottom() - RESIZE_MARGIN
+        if left and top:
+            return Qt.Edge.LeftEdge | Qt.Edge.TopEdge
+        if right and top:
+            return Qt.Edge.RightEdge | Qt.Edge.TopEdge
+        if left and bottom:
+            return Qt.Edge.LeftEdge | Qt.Edge.BottomEdge
+        if right and bottom:
+            return Qt.Edge.RightEdge | Qt.Edge.BottomEdge
         return None
 
+    def _resize_cursor(self, edges):
+        if edges in (
+            Qt.Edge.LeftEdge | Qt.Edge.TopEdge,
+            Qt.Edge.RightEdge | Qt.Edge.BottomEdge,
+        ):
+            return Qt.CursorShape.SizeFDiagCursor
+        return Qt.CursorShape.SizeBDiagCursor
+
+    def _is_window_side(self, global_pos):
+        geometry = self.frameGeometry()
+        return (
+            global_pos.x() <= geometry.left() + RESIZE_MARGIN
+            or global_pos.x() >= geometry.right() - RESIZE_MARGIN
+            or global_pos.y() <= geometry.top() + RESIZE_MARGIN
+            or global_pos.y() >= geometry.bottom() - RESIZE_MARGIN
+        )
+
     def _resize_manually(self, global_pos):
         start_geometry = self._resize_start_geometry
         start_pos = self._resize_global_pos
@@ -360,19 +394,31 @@ def _resize_manually(self, global_pos):
 
         delta_x = global_pos.x() - start_pos.x()
         width = start_geometry.width()
-        if self._resize_edges == Qt.Edge.LeftEdge:
+        height = start_geometry.height()
+        if self._resize_edges & Qt.Edge.LeftEdge:
             width -= delta_x
-        else:
+        elif self._resize_edges & Qt.Edge.RightEdge:
             width += delta_x
+        if self._resize_edges & Qt.Edge.TopEdge:
+            height -= global_pos.y() - start_pos.y()
+        elif self._resize_edges & Qt.Edge.BottomEdge:
+            height += global_pos.y() - start_pos.y()
 
         width = max(self.minimumWidth(), width)
         if self.maximumWidth() < 16777215:
             width = min(self.maximumWidth(), width)
-        if self._resize_edges == Qt.Edge.LeftEdge:
+        height = max(self.minimumHeight(), height)
+        if self.maximumHeight() < 16777215:
+            height = min(self.maximumHeight(), height)
+        if self._resize_edges & Qt.Edge.LeftEdge:
             x = start_geometry.right() - width + 1
         else:
             x = start_geometry.x()
-        self.setGeometry(x, start_geometry.y(), width, self.height())
+        if self._resize_edges & Qt.Edge.TopEdge:
+            y = start_geometry.bottom() - height + 1
+        else:
+            y = start_geometry.y()
+        self.setGeometry(x, y, width, height)
 
     def _start_system_move(self):
         handle = self.windowHandle()
@@ -443,7 +489,11 @@ def _is_chat_panel_child(self, obj):
         return False
 
     def _resize_to_content(self):
-        if self._resizing_to_content:
+        if (
+            self._resizing_to_content
+            or self._using_system_resize
+            or self._resize_start_geometry is not None
+        ):
             return
         self._resizing_to_content = True
         try:

tests/gui/uimain/test_uimain.py

@@ -1190,7 +1190,9 @@ def test_mini_mode_window_prefers_system_move(qtbot, app_mock, monkeypatch):
     assert not window._using_system_move
 
 
-def test_mini_mode_window_resizes_from_right_edge(qtbot, app_mock, monkeypatch):
+def test_mini_mode_window_resizes_from_bottom_right_corner(
+    qtbot, app_mock, monkeypatch
+):
     _prepare_dynamic_island_app(app_mock)
     app_mock.ai = FakeAI()
     window = MiniModeWindow(app_mock)
@@ -1200,8 +1202,11 @@ def test_mini_mode_window_resizes_from_right_edge(qtbot, app_mock, monkeypatch):
     monkeypatch.setattr(window, "_start_system_resize", lambda _edges: False)
 
     start_geometry = window.frameGeometry()
-    start_pos = QPointF(start_geometry.right(), start_geometry.center().y())
-    moved_pos = QPointF(start_geometry.right() + 40, start_geometry.center().y())
+    start_pos = QPointF(start_geometry.right(), start_geometry.bottom())
+    moved_pos = QPointF(
+        start_geometry.right() + 40,
+        start_geometry.bottom() + 20,
+    )
 
     assert window._handle_resize_event(
         window,
@@ -1217,6 +1222,43 @@ def test_mini_mode_window_resizes_from_right_edge(qtbot, app_mock, monkeypatch):
     )
 
     assert window.width() == start_geometry.width() + 40
+    assert window.height() == start_geometry.height() + 20
+
+
+def test_mini_mode_window_moves_from_edge_middle(qtbot, app_mock, monkeypatch):
+    _prepare_dynamic_island_app(app_mock)
+    app_mock.ai = FakeAI()
+    window = MiniModeWindow(app_mock)
+    qtbot.addWidget(window)
+    window.show()
+    window._toggle_ai_chat_panel()
+    monkeypatch.setattr(window, "_start_system_move", lambda: False)
+
+    start_geometry = window.frameGeometry()
+    edge_pos = QPointF(start_geometry.right(), start_geometry.center().y())
+    moved_pos = QPointF(edge_pos.x() + 40, edge_pos.y() + 20)
+
+    assert not window._handle_resize_event(
+        window,
+        _FakeMouseEvent(QEvent.Type.MouseButtonPress, edge_pos),
+    )
+    assert window._handle_drag_event(
+        window,
+        _FakeMouseEvent(QEvent.Type.MouseButtonPress, edge_pos),
+    )
+    assert window._handle_drag_event(
+        window,
+        _FakeMouseEvent(QEvent.Type.MouseMove, moved_pos),
+    )
+    assert window._handle_drag_event(
+        window,
+        _FakeMouseEvent(QEvent.Type.MouseButtonRelease, moved_pos),
+    )
+
+    assert window.pos() == QPoint(
+        start_geometry.x() + 40,
+        start_geometry.y() + 20,
+    )
 
 
 def test_mini_mode_window_does_not_drag_from_controls(qtbot, app_mock):