frontend: Improve spin box UX

Author: Warchamp7

frontend/CMakeLists.txt

@@ -26,6 +26,11 @@ if(NOT TARGET OBS::bpm)
   add_subdirectory("${CMAKE_SOURCE_DIR}/shared/bpm" bpm)
 endif()
 
+if(NOT TARGET OBS::qt-clamped-doublespinbox)
+  add_subdirectory(
+    "${CMAKE_SOURCE_DIR}/shared/qt/clamped-doublespinbox" clamped-doublespinbox)
+endif()
+
 add_executable(obs-studio)
 add_executable(OBS::studio ALIAS obs-studio)
 
@@ -40,6 +45,7 @@ target_link_libraries(
     OBS::frontend-api
     OBS::json11
     OBS::bpm
+    OBS::qt-clamped-doublespinbox
 )
 
 include(cmake/ui-components.cmake)

frontend/dialogs/OBSBasicTransform.cpp

@@ -1,6 +1,7 @@
 #include "OBSBasicTransform.hpp"
 
 #include <widgets/OBSBasic.hpp>
+#include "ClampedDoubleSpinBox.hpp"
 
 #include "moc_OBSBasicTransform.cpp"
 

frontend/forms/OBSBasicTransform.ui

@@ -88,7 +88,7 @@
           <number>0</number>
          </property>
          <item>
-          <widget class="QDoubleSpinBox" name="positionX">
+          <widget class="ClampedDoubleSpinBox" name="positionX">
            <property name="minimumSize">
             <size>
              <width>120</width>
@@ -119,7 +119,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QDoubleSpinBox" name="positionY">
+          <widget class="ClampedDoubleSpinBox" name="positionY">
            <property name="minimumSize">
             <size>
              <width>120</width>
@@ -163,7 +163,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QDoubleSpinBox" name="rotation">
+       <widget class="ClampedDoubleSpinBox" name="rotation">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -231,7 +231,7 @@
           <number>0</number>
          </property>
          <item>
-          <widget class="QDoubleSpinBox" name="sizeX">
+          <widget class="ClampedDoubleSpinBox" name="sizeX">
            <property name="minimumSize">
             <size>
              <width>120</width>
@@ -265,7 +265,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QDoubleSpinBox" name="sizeY">
+          <widget class="ClampedDoubleSpinBox" name="sizeY">
            <property name="minimumSize">
             <size>
              <width>120</width>
@@ -531,7 +531,7 @@
           <number>0</number>
          </property>
          <item>
-          <widget class="QDoubleSpinBox" name="boundsWidth">
+          <widget class="ClampedDoubleSpinBox" name="boundsWidth">
            <property name="enabled">
             <bool>false</bool>
            </property>
@@ -565,7 +565,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QDoubleSpinBox" name="boundsHeight">
+          <widget class="ClampedDoubleSpinBox" name="boundsHeight">
            <property name="enabled">
             <bool>false</bool>
            </property>
@@ -852,6 +852,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ClampedDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>ClampedDoubleSpinBox.hpp</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>

shared/properties-view/CMakeLists.txt

@@ -28,6 +28,13 @@ if(NOT TARGET OBS::qt-icon-label)
   add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/icon-label" "${CMAKE_BINARY_DIR}/shared/qt/icon-label")
 endif()
 
+if(NOT TARGET OBS::qt-clamped-doublespinbox)
+  add_subdirectory(
+    "${CMAKE_SOURCE_DIR}/shared/qt/clamped-doublespinbox"
+    "${CMAKE_BINARY_DIR}/shared/qt/clamped-doublespinbox"
+  )
+endif()
+
 add_library(properties-view INTERFACE)
 add_library(OBS::properties-view ALIAS properties-view)
 
@@ -51,6 +58,7 @@ target_link_libraries(
     OBS::libobs
     OBS::qt-wrappers
     OBS::qt-plain-text-edit
+    OBS::qt-clamped-doublespinbox
     OBS::qt-vertical-scroll-area
     OBS::qt-slider-ignorewheel
     OBS::qt-icon-label

shared/properties-view/properties-view.cpp

@@ -25,6 +25,7 @@
 #include <QObject>
 #include <QDesktopServices>
 #include <QUuid>
+#include "ClampedDoubleSpinBox.hpp"
 #include "double-slider.hpp"
 #include "spinbox-ignorewheel.hpp"
 #include "moc_properties-view.cpp"
@@ -479,7 +480,7 @@ void OBSPropertiesView::AddFloat(obs_property_t *prop, QFormLayout *layout, QLab
 
 	const char *name = obs_property_name(prop);
 	double val = obs_data_get_double(settings, name);
-	QDoubleSpinBox *spin = new QDoubleSpinBox();
+	ClampedDoubleSpinBox *spin = new ClampedDoubleSpinBox();
 
 	if (!obs_property_enabled(prop))
 		spin->setEnabled(false);
@@ -512,8 +513,12 @@ void OBSPropertiesView::AddFloat(obs_property_t *prop, QFormLayout *layout, QLab
 		slider->setOrientation(Qt::Horizontal);
 		subLayout->addWidget(slider);
 
-		connect(slider, &DoubleSlider::doubleValChanged, spin, &QDoubleSpinBox::setValue);
-		connect(spin, &QDoubleSpinBox::valueChanged, slider, &DoubleSlider::setDoubleVal);
+		connect(slider, &DoubleSlider::doubleValChanged, spin, [spin](double value) { spin->setValue(value); });
+		connect(spin, &QDoubleSpinBox::valueChanged, slider, [slider](double value) {
+			bool wasBlocked = slider->blockSignals(true);
+			slider->setDoubleVal(value);
+			slider->blockSignals(wasBlocked);
+		});
 	}
 
 	connect(spin, &QDoubleSpinBox::valueChanged, info, &WidgetInfo::ControlChanged);

shared/qt/clamped-doublespinbox/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.28...3.30)
+
+find_package(Qt6 REQUIRED Core Widgets)
+
+add_library(qt-clamped-doublespinbox INTERFACE)
+add_library(OBS::qt-clamped-doublespinbox ALIAS qt-clamped-doublespinbox)
+
+target_sources(qt-clamped-doublespinbox INTERFACE ClampedDoubleSpinBox.cpp ClampedDoubleSpinBox.hpp)
+target_include_directories(qt-clamped-doublespinbox INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
+
+target_link_libraries(qt-clamped-doublespinbox INTERFACE Qt::Core Qt::Widgets)