add: added QoL features

BlocksScreen/lib/panels/widgets/keyboardPage.py

@@ -91,6 +91,7 @@ def __init__(self, parent: QtWidgets.QWidget) -> None:
         self._key_buttons: list[QtWidgets.QPushButton] = []
         self._pattern: str = ""
         self._max_length: int = 0
+        self.firsttime: bool = True
 
         self._setup_ui()
         self.setCursor(QtCore.Qt.CursorShape.BlankCursor)
@@ -213,6 +214,7 @@ def _geometry_calc(self) -> None:
 
     def show(self) -> None:
         self._geometry_calc()
+        self.firsttime = True
         return super().show()
 
     def handle_keyboard_layout(self) -> None:
@@ -244,6 +246,11 @@ def handle_keyboard_layout(self) -> None:
 
     def value_inserted(self, value: str) -> None:
         """Handle key press: append char, delete, or submit on enter."""
+
+        if self.firsttime:
+            self.current_value = ""
+            self.firsttime = False
+
         if value == "&&":
             value = "&"
 

BlocksScreen/lib/panels/widgets/numpadPage.py

@@ -22,6 +22,7 @@ def __init__(
         self.name: str = ""
         self.min_value: int = 0
         self.max_value: int = 100
+        self.enforce_range: bool = True
         self.firsttime: bool = True
 
         self.numpad_0.clicked.connect(lambda: self.value_inserted("0"))
@@ -41,6 +42,8 @@ def __init__(
 
     def showEvent(self, a0: QtGui.QShowEvent | None) -> None:
         self.firsttime = True
+        self.enforce_range = True
+        self.min_max_label.setVisible(True)
         return super().showEvent(a0)
 
     def value_inserted(self, value: str) -> None:
@@ -58,10 +61,12 @@ def value_inserted(self, value: str) -> None:
             else:
                 self.current_value += str(value)
 
+        in_range = self.min_value <= int(self.current_value) <= self.max_value
+
         if "enter" in value and self.current_value.isnumeric():
             if len(self.current_value) == 0:
                 self.current_value = "0"
-            if self.min_value <= int(self.current_value) <= self.max_value:
+            if in_range or not self.enforce_range:
                 self.value_selected.emit(self.name, int(self.current_value))
                 self.request_back.emit()
 
@@ -71,7 +76,7 @@ def value_inserted(self, value: str) -> None:
             else:
                 self.current_value = "0"
 
-        if not (self.min_value <= int(self.current_value) <= self.max_value):
+        if not in_range and self.enforce_range:
             self.start_glow_animation.emit()
         else:
             self.inserted_value.glow_animation.stop()
@@ -104,6 +109,11 @@ def set_max_value(self, max_value: int) -> None:
         self.max_value = max_value
         self.update_min_max_label()
 
+    def set_enforce_range(self, enforce: bool = True) -> None:
+        """Enable or disable min/max range enforcement. Enabled by default."""
+        self.enforce_range = enforce
+        self.min_max_label.setVisible(enforce)
+
     def update_min_max_label(self) -> None:
         """Updates the text of the min/max label."""
         self.min_max_label.setText(f"Range: {self.min_value} - {self.max_value}")
@@ -133,6 +143,11 @@ def _setupUI(self) -> None:
 
         self.header_layout.setContentsMargins(0, 0, 0, 0)
         self.header_layout.setObjectName("header_layout")
+
+        blank = QtWidgets.QWidget(self)
+        blank.setFixedSize(60, 60)
+        self.header_layout.addWidget(blank)
+
         self.numpad_title = BlocksLabel(self)
         self.numpad_title.setMinimumSize(QtCore.QSize(500, 60))
         self.numpad_title.setMaximumSize(QtCore.QSize(16777215, 60))

BlocksScreen/lib/utils/blocks_linedit.py

@@ -22,6 +22,7 @@ def __init__(self, parent: typing.Optional[QtWidgets.QWidget] = None) -> None:
 
         # Pre-allocated colors (avoid allocation in paint)
         self._bg_color = QtGui.QColor(223, 223, 223)
+        self._disabled_bg_color = QtGui.QColor(169, 169, 169)
         self._bg_pressed_color = QtGui.QColor(200, 200, 200)
         self._text_color = QtGui.QColor(0, 0, 0)
         self._placeholder_color = QtGui.QColor(130, 130, 130)
@@ -82,20 +83,20 @@ def _get_text_rect(self) -> QtCore.QRect:
 
     def mousePressEvent(self, event: QtGui.QMouseEvent) -> None:
         """Handle mouse press"""
+        if not self.isEnabled():
+            return
         self.clicked.emit()
         super().mousePressEvent(event)
 
-    def mouseReleaseEvent(self, event: QtGui.QMouseEvent) -> None:
-        """Handle mouse release"""
-        super().mouseReleaseEvent(event)
-
     def paintEvent(self, event: typing.Optional[QtGui.QPaintEvent]) -> None:
         """Custom paint with embedded toggle button."""
         painter = QtGui.QPainter(self)
         painter.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing, True)
 
         # Background
-        painter.setBrush(self._bg_color)
+        painter.setBrush(
+            self._bg_color if self.isEnabled() else self._disabled_bg_color
+        )
         painter.setPen(QtCore.Qt.PenStyle.NoPen)
         painter.drawRoundedRect(self.rect(), self.CORNER_RADIUS, self.CORNER_RADIUS)
 

tests/util/test_keyboard_page_unit.py

@@ -175,7 +175,7 @@ def test_set_value_prefills(self, keyboard):
     def test_set_value_then_type(self, keyboard):
         keyboard.set_value("abc")
         keyboard.value_inserted("d")
-        assert keyboard.current_value == "abcd"
+        assert keyboard.current_value == "d"
 
 
 class TestDotButton: