refactor: Prop widget 2 (#485)

* initial

* typing

* fix: refactor _WheelBlocker to inherit from QObject and simplify instance management

* add tests

* use v2 and fix tests

* less test

* remove unneded examples

* remove unneeded wheel stuff

Author: tlambert03

src/pymmcore_widgets/_util.py

@@ -6,19 +6,15 @@
 
 from psygnal import SignalInstance
 from pymmcore_plus import CMMCorePlus
-from qtpy.QtCore import QEvent, QMarginsF, QObject, Qt
-from qtpy.QtGui import QPainter, QPaintEvent, QPen, QResizeEvent, QWheelEvent
+from qtpy.QtCore import QMarginsF, QObject, Qt
+from qtpy.QtGui import QPainter, QPaintEvent, QPen, QResizeEvent
 from qtpy.QtWidgets import (
-    QAbstractSlider,
-    QAbstractSpinBox,
     QComboBox,
     QDialog,
     QDialogButtonBox,
     QGraphicsScene,
     QGraphicsView,
     QLabel,
-    QScrollBar,
-    QTableWidget,
     QVBoxLayout,
     QWidget,
 )
@@ -30,41 +26,6 @@
     from typing import Any
 
 
-class NoWheelTableWidget(QTableWidget):
-    """QTableWidget that prevents scrolling behavior of child widgets."""
-
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
-        if view := self.viewport():
-            view.installEventFilter(self)
-
-    def setCellWidget(self, row: int, column: int, widget: QWidget | None) -> None:
-        if widget is not None:
-            # Note that PySide does not allow a tuple as an arg to findChildren
-            for widget_type in (QAbstractSpinBox, QAbstractSlider, QComboBox):
-                for child in widget.findChildren(widget_type):
-                    child.installEventFilter(self)
-            widget.installEventFilter(self)
-        super().setCellWidget(row, column, widget)
-
-    def eventFilter(self, object: QObject | None, event: QEvent | None) -> bool:
-        # Many "value widgets" (e.g. Combo boxes, sliders) use scroll events to
-        # change their value. The purpose of this widget is to prevent that.
-        # Note that if that widget provides a scrollbar (e.g. the ListView
-        # dropdown of a Combo Box), scroll events going to that scrollbar should
-        # be let through.
-        if isinstance(event, QWheelEvent) and not isinstance(object, QScrollBar):
-            # Scroll the vertical scrollbar manually, to avoid recursion error.
-            if sb := self.verticalScrollBar():
-                delta = event.angleDelta().y()
-                sb.setValue(sb.value() - delta)
-            # Consume the event so child widgets don't process it
-            return True
-
-        # otherwise process normally
-        return False
-
-
 class ComboMessageBox(QDialog):
     """Dialog that presents a combo box of `items`."""
 

src/pymmcore_widgets/config_presets/_group_preset_widget/_group_preset_table_widget.py

@@ -20,7 +20,7 @@
     QWidget,
 )
 
-from pymmcore_widgets._util import NoWheelTableWidget, block_core, load_system_config
+from pymmcore_widgets._util import block_core, load_system_config
 from pymmcore_widgets.control._presets_widget import PresetsWidget
 from pymmcore_widgets.device_properties._property_widget import PropertyWidget
 
@@ -32,7 +32,7 @@
 UNNAMED_PRESET = "NewPreset"
 
 
-class _MainTable(NoWheelTableWidget):
+class _MainTable(QTableWidget):
     """Set table properties for Group and Preset TableWidget."""
 
     def __init__(self) -> None:
@@ -229,7 +229,7 @@ def _populate_table(self) -> None:
                 if isinstance(wdg, PresetsWidget):
                     wdg = wdg._combo
                 elif isinstance(wdg, PropertyWidget):
-                    wdg = wdg._value_widget  # type: ignore
+                    wdg = wdg.inner_widget
 
         # resize to contents the table
         self.table_wdg.resizeColumnToContents(0)

src/pymmcore_widgets/config_presets/_pixel_configuration_widget.py

@@ -660,7 +660,7 @@ def setValue(self, value: list[Setting]) -> None:
                     # get the value of the PropertyWidget from value
                     val = value_dict[(dev_prop.device, dev_prop.name)]
                     # update the value of the PropertyWidget
-                    with signals_blocked(val_wdg._value_widget):
+                    with signals_blocked(val_wdg.inner_widget):
                         val_wdg.setValue(val)
 
                     self._prop_table.item(row, 0).setCheckState(Qt.CheckState.Checked)
@@ -701,7 +701,7 @@ def _on_item_changed(self) -> None:
             # connect the valueChanged signal of the PropertyWidget to the
             # _update_property_table method that will update the value of the
             # PropertyWidget in the DevicePropertyTable when the PropertyWidget changes.
-            wdg._value_widget.valueChanged.connect(self._update_property_table)
+            wdg.inner_widget.valueChanged.connect(self._update_property_table)
             # to_view_table.append((dev, prop, val, wdg))
             to_view_table.append((dev, prop, wdg))
 
@@ -726,7 +726,7 @@ def _update_property_table(self, value: Any) -> None:
         table_prop_row = table_prop_item[0].row()
         # get property widget and update the value
         wdg = cast("PropertyWidget", self._prop_table.cellWidget(table_prop_row, 1))
-        with signals_blocked(wdg._value_widget):
+        with signals_blocked(wdg.inner_widget):
             wdg.setValue(value)
 
         self.valueChanged.emit(self.value())

src/pymmcore_widgets/device_properties/_device_property_table.py

@@ -9,7 +9,6 @@
 from qtpy.QtWidgets import QAbstractScrollArea, QTableWidget, QTableWidgetItem, QWidget
 
 from pymmcore_widgets._icons import StandardIcon
-from pymmcore_widgets._util import NoWheelTableWidget
 
 from ._property_widget import PropertyWidget
 
@@ -19,7 +18,7 @@
 logger = getLogger(__name__)
 
 
-class DevicePropertyTable(NoWheelTableWidget):
+class DevicePropertyTable(QTableWidget):
     """Table of all currently loaded device properties.
 
     This table is used by `PropertyBrowser` to display all properties in the system,