From 0020df98f4007d35080270de468e631a9c59a903 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Wed, 17 Jan 2024 08:38:17 +0100 Subject: [PATCH] UI,shared: Move SliderIgnoreScroll to its own directory --- UI/absolute-slider.hpp | 2 +- UI/cmake/legacy.cmake | 10 +++++++--- UI/cmake/ui-elements.cmake | 10 +++++++--- UI/double-slider.hpp | 2 +- .../aja-output-ui/CMakeLists.txt | 6 ++++++ .../aja-output-ui/cmake/legacy.cmake | 10 +++++++--- .../decklink-output-ui/CMakeLists.txt | 6 ++++++ .../decklink-output-ui/cmake/legacy.cmake | 20 ++++++++++++++----- .../frontend-tools/CMakeLists.txt | 6 ++++++ .../frontend-tools/cmake/legacy.cmake | 20 ++++++++++++++----- UI/obs-app.cpp | 1 + UI/properties-view.cpp | 2 +- UI/volume-control.cpp | 1 + UI/window-basic-main-transitions.cpp | 2 +- shared/qt/slider-ignorewheel/CMakeLists.txt | 11 ++++++++++ .../slider-ignorewheel.cpp | 0 .../slider-ignorewheel.hpp | 2 +- 17 files changed, 87 insertions(+), 24 deletions(-) create mode 100644 shared/qt/slider-ignorewheel/CMakeLists.txt rename {UI => shared/qt/slider-ignorewheel}/slider-ignorewheel.cpp (100%) rename {UI => shared/qt/slider-ignorewheel}/slider-ignorewheel.hpp (97%) diff --git a/UI/absolute-slider.hpp b/UI/absolute-slider.hpp index a54699324..67e0adb1f 100644 --- a/UI/absolute-slider.hpp +++ b/UI/absolute-slider.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "slider-ignorewheel.hpp" +#include class AbsoluteSlider : public SliderIgnoreScroll { Q_OBJECT diff --git a/UI/cmake/legacy.cmake b/UI/cmake/legacy.cmake index e74b77f83..96aa76d6e 100644 --- a/UI/cmake/legacy.cmake +++ b/UI/cmake/legacy.cmake @@ -75,6 +75,11 @@ if(NOT TARGET OBS::qt-plain-text-edit) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit") endif() +if(NOT TARGET OBS::qt-slider-ignorewheel) + add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel" + "${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel") +endif() + if(NOT TARGET OBS::qt-vertical-scroll-area) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area" "${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area") @@ -212,8 +217,6 @@ target_sources( scene-tree.cpp scene-tree.hpp screenshot-obj.hpp - slider-ignorewheel.cpp - slider-ignorewheel.hpp source-label.cpp source-label.hpp spinbox-ignorewheel.cpp @@ -323,7 +326,8 @@ target_link_libraries( OBS::frontend-api OBS::qt-wrappers OBS::qt-plain-text-edit - OBS::qt-vertical-scroll-area) + OBS::qt-vertical-scroll-area + OBS::qt-slider-ignorewheel) set_target_properties(obs PROPERTIES FOLDER "frontend") diff --git a/UI/cmake/ui-elements.cmake b/UI/cmake/ui-elements.cmake index e7ac5d430..65f73f41a 100644 --- a/UI/cmake/ui-elements.cmake +++ b/UI/cmake/ui-elements.cmake @@ -12,8 +12,6 @@ target_sources( properties-view.cpp properties-view.hpp properties-view.moc.hpp - slider-ignorewheel.cpp - slider-ignorewheel.hpp spinbox-ignorewheel.cpp spinbox-ignorewheel.hpp) @@ -26,12 +24,18 @@ if(NOT TARGET OBS::qt-plain-text-edit) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit") endif() +if(NOT TARGET OBS::qt-slider-ignorewheel) + add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel" + "${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel") +endif() + if(NOT TARGET OBS::qt-vertical-scroll-area) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area" "${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area") endif() -target_link_libraries(obs-studio PRIVATE OBS::qt-plain-text-edit OBS::qt-vertical-scroll-area) +target_link_libraries(obs-studio PRIVATE OBS::qt-plain-text-edit OBS::qt-slider-ignorewheel + OBS::qt-vertical-scroll-area) target_sources( obs-studio diff --git a/UI/double-slider.hpp b/UI/double-slider.hpp index cf0e966cf..8274506d0 100644 --- a/UI/double-slider.hpp +++ b/UI/double-slider.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "slider-ignorewheel.hpp" +#include class DoubleSlider : public SliderIgnoreScroll { Q_OBJECT diff --git a/UI/frontend-plugins/aja-output-ui/CMakeLists.txt b/UI/frontend-plugins/aja-output-ui/CMakeLists.txt index 324f1f885..0281b5462 100644 --- a/UI/frontend-plugins/aja-output-ui/CMakeLists.txt +++ b/UI/frontend-plugins/aja-output-ui/CMakeLists.txt @@ -27,6 +27,11 @@ if(NOT TARGET OBS::qt-plain-text-edit) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit") endif() +if(NOT TARGET OBS::qt-slider-ignorewheel) + add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel" + "${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel") +endif() + if(NOT TARGET OBS::qt-vertical-scroll-area) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area" "${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area") @@ -54,6 +59,7 @@ target_link_libraries( OBS::aja-support OBS::frontend-api OBS::qt-plain-text-edit + OBS::qt-slider-ignorewheel OBS::qt-vertical-scroll-area OBS::qt-wrappers OBS::ui-support diff --git a/UI/frontend-plugins/aja-output-ui/cmake/legacy.cmake b/UI/frontend-plugins/aja-output-ui/cmake/legacy.cmake index 60c4d441a..617be178a 100644 --- a/UI/frontend-plugins/aja-output-ui/cmake/legacy.cmake +++ b/UI/frontend-plugins/aja-output-ui/cmake/legacy.cmake @@ -13,6 +13,11 @@ if(NOT TARGET OBS::qt-plain-text-edit) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit") endif() +if(NOT TARGET OBS::qt-slider-ignorewheel) + add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel" + "${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel") +endif() + if(NOT TARGET OBS::qt-vertical-scroll-area) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area" "${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area") @@ -65,9 +70,7 @@ target_sources( ${CMAKE_SOURCE_DIR}/UI/properties-view.cpp ${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp ${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp - ${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp - ${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp - ${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.hpp) + ${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp) target_link_libraries( aja-output-ui @@ -76,6 +79,7 @@ target_link_libraries( OBS::qt-wrappers OBS::qt-plain-text-edit OBS::qt-vertical-scroll-area + OBS::qt-slider-ignorewheel Qt::Widgets AJA::LibAJANTV2) diff --git a/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt b/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt index 3307854d5..f8e9a356f 100644 --- a/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt +++ b/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt @@ -29,6 +29,11 @@ if(NOT TARGET OBS::qt-vertical-scroll-area) "${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area") endif() +if(NOT TARGET OBS::qt-slider-ignorewheel) + add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel" + "${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel") +endif() + if(NOT TARGET OBS::qt-wrappers) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers") endif() @@ -45,6 +50,7 @@ target_link_libraries( PRIVATE OBS::libobs OBS::frontend-api OBS::qt-plain-text-edit + OBS::qt-slider-ignorewheel OBS::qt-vertical-scroll-area OBS::qt-wrappers OBS::ui-support diff --git a/UI/frontend-plugins/decklink-output-ui/cmake/legacy.cmake b/UI/frontend-plugins/decklink-output-ui/cmake/legacy.cmake index 7f2cd4744..e325b55c5 100644 --- a/UI/frontend-plugins/decklink-output-ui/cmake/legacy.cmake +++ b/UI/frontend-plugins/decklink-output-ui/cmake/legacy.cmake @@ -11,6 +11,11 @@ if(NOT TARGET OBS::qt-plain-text-edit) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit") endif() +if(NOT TARGET OBS::qt-slider-ignorewheel) + add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel" + "${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel") +endif() + if(NOT TARGET OBS::qt-vertical-scroll-area) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area" "${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area") @@ -47,12 +52,17 @@ target_sources( ${CMAKE_SOURCE_DIR}/UI/properties-view.cpp ${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp ${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp - ${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp - ${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp - ${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.hpp) + ${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp) -target_link_libraries(decklink-output-ui PRIVATE OBS::libobs OBS::frontend-api OBS::qt-wrappers OBS::qt-plain-text-edit - OBS::qt-vertical-scroll-area Qt::Widgets) +target_link_libraries( + decklink-output-ui + PRIVATE OBS::libobs + OBS::frontend-api + OBS::qt-wrappers + OBS::qt-plain-text-edit + OBS::qt-vertical-scroll-area + OBS::qt-slider-ignorewheel + Qt::Widgets) target_compile_features(decklink-output-ui PRIVATE cxx_std_17) diff --git a/UI/frontend-plugins/frontend-tools/CMakeLists.txt b/UI/frontend-plugins/frontend-tools/CMakeLists.txt index 185c1bbf8..7c9885472 100644 --- a/UI/frontend-plugins/frontend-tools/CMakeLists.txt +++ b/UI/frontend-plugins/frontend-tools/CMakeLists.txt @@ -23,6 +23,11 @@ if(NOT TARGET OBS::qt-vertical-scroll-area) "${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area") endif() +if(NOT TARGET OBS::qt-slider-ignorewheel) + add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel" + "${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel") +endif() + if(NOT TARGET OBS::qt-wrappers) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers") endif() @@ -59,6 +64,7 @@ target_link_libraries( PRIVATE OBS::frontend-api OBS::libobs OBS::qt-plain-text-edit + OBS::qt-slider-ignorewheel OBS::qt-vertical-scroll-area OBS::qt-wrappers OBS::ui-support diff --git a/UI/frontend-plugins/frontend-tools/cmake/legacy.cmake b/UI/frontend-plugins/frontend-tools/cmake/legacy.cmake index 06167de72..4d5a5547e 100644 --- a/UI/frontend-plugins/frontend-tools/cmake/legacy.cmake +++ b/UI/frontend-plugins/frontend-tools/cmake/legacy.cmake @@ -7,6 +7,11 @@ if(NOT TARGET OBS::qt-plain-text-edit) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit") endif() +if(NOT TARGET OBS::qt-slider-ignorewheel) + add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel" + "${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel") +endif() + if(NOT TARGET OBS::qt-vertical-scroll-area) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area" "${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area") @@ -48,14 +53,19 @@ target_sources( ${CMAKE_SOURCE_DIR}/UI/properties-view.hpp ${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp ${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp - ${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp - ${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp - ${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.hpp) + ${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp) target_compile_features(frontend-tools PRIVATE cxx_std_17) -target_link_libraries(frontend-tools PRIVATE OBS::frontend-api OBS::qt-wrappers OBS::qt-plain-text-edit - OBS::qt-vertical-scroll-area OBS::libobs Qt::Widgets) +target_link_libraries( + frontend-tools + PRIVATE OBS::frontend-api + OBS::qt-wrappers + OBS::qt-plain-text-edit + OBS::qt-vertical-scroll-area + OBS::qt-slider-ignorewheel + OBS::libobs + Qt::Widgets) if(OS_POSIX AND NOT OS_MACOS) target_link_libraries(frontend-tools PRIVATE Qt::GuiPrivate) diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp index d2337dae0..849226f45 100644 --- a/UI/obs-app.cpp +++ b/UI/obs-app.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include diff --git a/UI/properties-view.cpp b/UI/properties-view.cpp index 2a4e031f0..67b541455 100644 --- a/UI/properties-view.cpp +++ b/UI/properties-view.cpp @@ -25,7 +25,6 @@ #include #include #include "double-slider.hpp" -#include "slider-ignorewheel.hpp" #include "spinbox-ignorewheel.hpp" #include "properties-view.hpp" #include "properties-view.moc.hpp" @@ -33,6 +32,7 @@ #include #include +#include #include #include #include diff --git a/UI/volume-control.cpp b/UI/volume-control.cpp index b629d8e67..6ab171103 100644 --- a/UI/volume-control.cpp +++ b/UI/volume-control.cpp @@ -5,6 +5,7 @@ #include "absolute-slider.hpp" #include "source-label.hpp" +#include #include #include #include diff --git a/UI/window-basic-main-transitions.cpp b/UI/window-basic-main-transitions.cpp index 304da0d59..ffb28344e 100644 --- a/UI/window-basic-main-transitions.cpp +++ b/UI/window-basic-main-transitions.cpp @@ -21,13 +21,13 @@ #include #include #include +#include #include "window-basic-main.hpp" #include "window-basic-main-outputs.hpp" #include "window-basic-vcam-config.hpp" #include "display-helpers.hpp" #include "window-namedialog.hpp" #include "menu-button.hpp" -#include "slider-ignorewheel.hpp" #include "obs-hotkey.h" diff --git a/shared/qt/slider-ignorewheel/CMakeLists.txt b/shared/qt/slider-ignorewheel/CMakeLists.txt new file mode 100644 index 000000000..b60ae3702 --- /dev/null +++ b/shared/qt/slider-ignorewheel/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.22...3.25) + +find_package(Qt6 REQUIRED Core Widgets) + +add_library(qt-slider-ignorewheel INTERFACE) +add_library(OBS::qt-slider-ignorewheel ALIAS qt-slider-ignorewheel) + +target_sources(qt-slider-ignorewheel INTERFACE slider-ignorewheel.cpp slider-ignorewheel.hpp) +target_include_directories(qt-slider-ignorewheel INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}") + +target_link_libraries(qt-slider-ignorewheel INTERFACE Qt::Core Qt::Widgets OBS::libobs) diff --git a/UI/slider-ignorewheel.cpp b/shared/qt/slider-ignorewheel/slider-ignorewheel.cpp similarity index 100% rename from UI/slider-ignorewheel.cpp rename to shared/qt/slider-ignorewheel/slider-ignorewheel.cpp diff --git a/UI/slider-ignorewheel.hpp b/shared/qt/slider-ignorewheel/slider-ignorewheel.hpp similarity index 97% rename from UI/slider-ignorewheel.hpp rename to shared/qt/slider-ignorewheel/slider-ignorewheel.hpp index 24e4056f2..5d8f35509 100644 --- a/UI/slider-ignorewheel.hpp +++ b/shared/qt/slider-ignorewheel/slider-ignorewheel.hpp @@ -1,6 +1,6 @@ #pragma once -#include "obs.hpp" +#include #include #include #include