Skip to content

frontend: Improve spin box UX #12337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+392 −17
Open

frontend: Improve spin box UX #12337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions frontend/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ 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)

Expand All @@ -40,6 +44,7 @@ target_link_libraries(
OBS::frontend-api
OBS::json11
OBS::bpm
OBS::qt-clamped-doublespinbox
)

include(cmake/ui-components.cmake)
Expand Down
4 changes: 4 additions & 0 deletions frontend/data/themes/Yami.obt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@

--padding_base_border: calc(var(--padding_base) + 1px);

--spinbox_min_width: calc(var(--input_height) * 2.5);
--spinbox_button_height: calc(var(--input_height_half) - 1px);

--volume_slider: calc(calc(4px + var(--font_base_value)) / 4);
Expand Down Expand Up @@ -1215,8 +1216,11 @@ QDoubleSpinBox {
border: var(--input_border_width) solid var(--input_bg);
border-radius: var(--border_radius);
padding: var(--input_padding) var(--input_text_padding);
padding-right: var(--padding_base);

height: var(--input_height);
max-height: var(--input_height);
min-width: var(--spinbox_min_width);
}

QSpinBox:hover,
Expand Down
1 change: 1 addition & 0 deletions frontend/dialogs/OBSBasicTransform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "OBSBasicTransform.hpp"

#include <widgets/OBSBasic.hpp>
#include "ClampedDoubleSpinBox.hpp"

#include "moc_OBSBasicTransform.cpp"

Expand Down
19 changes: 12 additions & 7 deletions frontend/forms/OBSBasicSettings.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="snapDistance">
<widget class="ClampedDoubleSpinBox" name="snapDistance">
<property name="decimals">
<number>1</number>
</property>
Expand Down Expand Up @@ -8703,19 +8703,24 @@
</widget>
<customwidgets>
<customwidget>
<class>UrlPushButton</class>
<extends>QPushButton</extends>
<header>components/UrlPushButton.hpp</header>
<class>ClampedDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>ClampedDoubleSpinBox.hpp</header>
</customwidget>
<customwidget>
<class>AbsoluteSlider</class>
<extends>QSlider</extends>
<header>components/AbsoluteSlider.hpp</header>
</customwidget>
<customwidget>
<class>OBSHotkeyEdit</class>
<extends>QLineEdit</extends>
<header>settings/OBSHotkeyEdit.hpp</header>
</customwidget>
<customwidget>
<class>AbsoluteSlider</class>
<extends>QSlider</extends>
<header>components/AbsoluteSlider.hpp</header>
<class>UrlPushButton</class>
<extends>QPushButton</extends>
<header>components/UrlPushButton.hpp</header>
</customwidget>
</customwidgets>
<tabstops>
Expand Down
21 changes: 14 additions & 7 deletions frontend/forms/OBSBasicTransform.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -119,7 +119,7 @@
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="positionY">
<widget class="ClampedDoubleSpinBox" name="positionY">
<property name="minimumSize">
<size>
<width>120</width>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -265,7 +265,7 @@
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="sizeY">
<widget class="ClampedDoubleSpinBox" name="sizeY">
<property name="minimumSize">
<size>
<width>120</width>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -565,7 +565,7 @@
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="boundsHeight">
<widget class="ClampedDoubleSpinBox" name="boundsHeight">
<property name="enabled">
<bool>false</bool>
</property>
Expand Down Expand Up @@ -852,6 +852,13 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ClampedDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>ClampedDoubleSpinBox.hpp</header>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
Expand Down
8 changes: 8 additions & 0 deletions shared/properties-view/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
Expand Down
7 changes: 4 additions & 3 deletions shared/properties-view/properties-view.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -512,8 +513,8 @@ 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, &ClampedDoubleSpinBox::setValue);
connect(spin, &ClampedDoubleSpinBox::valueChanged, slider, &DoubleSlider::setDoubleVal);
}

connect(spin, &QDoubleSpinBox::valueChanged, info, &WidgetInfo::ControlChanged);
Expand Down
11 changes: 11 additions & 0 deletions shared/qt/clamped-doublespinbox/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Loading