250723.4

Author: graham-trott

dist/easycoder-250723.2-py2.py3-none-any.whl renamed to dist/easycoder-250723.4-py2.py3-none-any.whl

@@ -11,4 +11,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250723.2"
+__version__ = "250723.4"

dist/easycoder-250723.2.tar.gz renamed to dist/easycoder-250723.4.tar.gz

@@ -1,4 +1,5 @@
 
+import os
 from .ec_handler import Handler
 from PySide6.QtWidgets import (
     QDialog,
@@ -11,11 +12,70 @@
     QSizePolicy,
     QGraphicsDropShadowEffect
 )
-from PySide6.QtGui import QFont, QIcon
-from PySide6.QtCore import Qt, QTimer
+from PySide6.QtGui import QFont, QIcon, QPixmap, QPainter, QColor
+from PySide6.QtCore import Qt, QTimer, Signal, QRect
 
 class Keyboard(Handler):
-
+    iconClicked = Signal()
+
+    class Border(QWidget):
+        iconClicked = Signal()
+
+        def __init__(self):
+            super().__init__()
+            self.setFixedHeight(25)
+            self._drag_active = False
+            self._drag_start_pos = None
+
+        def paintEvent(self, event):
+            painter = QPainter(self)
+            painter.setRenderHint(QPainter.Antialiasing)
+            # Draw the close icon
+            self.pixmap = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/close.png').scaled(25, 25, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+            x = self.width() - self.pixmap.width()
+            y = 0
+            painter.drawPixmap(x, y, self.pixmap)
+
+            # Draw the drag bar in the center
+            bar_width = 100
+            bar_height = 20
+            bar_x = (self.width() - bar_width) // 2
+            bar_y = (self.height() - bar_height) // 2
+            painter.setBrush(QColor("#bbb"))
+            painter.setPen(Qt.NoPen)
+            painter.drawRoundedRect(bar_x, bar_y, bar_width, bar_height, 10, 10)
+
+        def mousePressEvent(self, event):
+            x = self.width() - self.pixmap.width()
+            y = 0
+            icon_rect = self.pixmap.rect().translated(x, y)
+            if icon_rect.contains(event.pos()):
+                self.iconClicked.emit()
+            elif self._bar_rect().contains(event.pos()):
+                self._drag_active = True
+                self._drag_start_pos = event.globalPosition().toPoint()
+                self._dialog_start_pos = self.window().pos()
+            else:
+                super().mousePressEvent(event)
+
+        def mouseMoveEvent(self, event):
+            if self._drag_active:
+                delta = event.globalPosition().toPoint() - self._drag_start_pos
+                self.window().move(self._dialog_start_pos + delta)
+            else:
+                super().mouseMoveEvent(event)
+
+        def mouseReleaseEvent(self, event):
+            self._drag_active = False
+            super().mouseReleaseEvent(event)
+
+        def _bar_rect(self):
+            bar_width = 100
+            bar_height = 20
+            bar_x = (self.width() - bar_width) // 2
+            bar_y = (self.height() - bar_height) // 2
+            return QRect(bar_x, bar_y, bar_width, bar_height)
+    
     def __init__(self, program, receiver, parent=None):
         Handler.__init__(self, program.compiler)
 
@@ -38,6 +98,10 @@ def __init__(self, program, receiver, parent=None):
 
         # Add the keyboard
         layout = QVBoxLayout(dialog)
+
+        border = self.Border()
+        border.iconClicked.connect(dialog.reject)
+        layout.addWidget(border)
         layout.addWidget(VirtualKeyboard(42, receiver, dialog.reject))
 
         # Position at bottom of parent window

easycoder/__init__.py

@@ -20,7 +20,7 @@ dependencies = [
 ]
 
 [tool.flit.sdist]
-include = ["ec_*.py"]
+include = ["ec_*.py", "*.png"]
 
 [project.scripts]
 easycoder = "easycoder:Main"