mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-08 04:22:55 +00:00
UI,shared: Move VScrollArea to its own directory
This commit is contained in:
parent
0bd6e0ba8a
commit
be48558755
|
@ -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")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
|
||||||
endif()
|
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()
|
||||||
|
|
||||||
if(NOT TARGET OBS::qt-wrappers)
|
if(NOT TARGET OBS::qt-wrappers)
|
||||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
||||||
endif()
|
endif()
|
||||||
|
@ -221,8 +226,6 @@ target_sources(
|
||||||
undo-stack-obs.hpp
|
undo-stack-obs.hpp
|
||||||
volume-control.cpp
|
volume-control.cpp
|
||||||
volume-control.hpp
|
volume-control.hpp
|
||||||
vertical-scroll-area.cpp
|
|
||||||
vertical-scroll-area.hpp
|
|
||||||
visibility-item-widget.cpp
|
visibility-item-widget.cpp
|
||||||
visibility-item-widget.hpp)
|
visibility-item-widget.hpp)
|
||||||
|
|
||||||
|
@ -319,7 +322,8 @@ target_link_libraries(
|
||||||
OBS::libobs
|
OBS::libobs
|
||||||
OBS::frontend-api
|
OBS::frontend-api
|
||||||
OBS::qt-wrappers
|
OBS::qt-wrappers
|
||||||
OBS::qt-plain-text-edit)
|
OBS::qt-plain-text-edit
|
||||||
|
OBS::qt-vertical-scroll-area)
|
||||||
|
|
||||||
set_target_properties(obs PROPERTIES FOLDER "frontend")
|
set_target_properties(obs PROPERTIES FOLDER "frontend")
|
||||||
|
|
||||||
|
|
|
@ -15,9 +15,7 @@ target_sources(
|
||||||
slider-ignorewheel.cpp
|
slider-ignorewheel.cpp
|
||||||
slider-ignorewheel.hpp
|
slider-ignorewheel.hpp
|
||||||
spinbox-ignorewheel.cpp
|
spinbox-ignorewheel.cpp
|
||||||
spinbox-ignorewheel.hpp
|
spinbox-ignorewheel.hpp)
|
||||||
vertical-scroll-area.cpp
|
|
||||||
vertical-scroll-area.hpp)
|
|
||||||
|
|
||||||
target_include_directories(obs-ui-support INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
|
target_include_directories(obs-ui-support INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||||
target_compile_options(obs-ui-support INTERFACE $<$<PLATFORM_ID:Linux>:-Wno-error=enum-conversion>)
|
target_compile_options(obs-ui-support INTERFACE $<$<PLATFORM_ID:Linux>:-Wno-error=enum-conversion>)
|
||||||
|
@ -28,7 +26,12 @@ 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")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(obs-studio PRIVATE OBS::qt-plain-text-edit)
|
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_sources(
|
target_sources(
|
||||||
obs-studio
|
obs-studio
|
||||||
|
|
|
@ -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")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
|
||||||
endif()
|
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()
|
||||||
|
|
||||||
if(NOT TARGET OBS::qt-wrappers)
|
if(NOT TARGET OBS::qt-wrappers)
|
||||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
||||||
endif()
|
endif()
|
||||||
|
@ -49,6 +54,7 @@ target_link_libraries(
|
||||||
OBS::aja-support
|
OBS::aja-support
|
||||||
OBS::frontend-api
|
OBS::frontend-api
|
||||||
OBS::qt-plain-text-edit
|
OBS::qt-plain-text-edit
|
||||||
|
OBS::qt-vertical-scroll-area
|
||||||
OBS::qt-wrappers
|
OBS::qt-wrappers
|
||||||
OBS::ui-support
|
OBS::ui-support
|
||||||
Qt::Widgets
|
Qt::Widgets
|
||||||
|
|
|
@ -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")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
|
||||||
endif()
|
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()
|
||||||
|
|
||||||
if(NOT TARGET OBS::qt-wrappers)
|
if(NOT TARGET OBS::qt-wrappers)
|
||||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
||||||
endif()
|
endif()
|
||||||
|
@ -62,12 +67,17 @@ target_sources(
|
||||||
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
|
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
|
||||||
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp
|
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp
|
||||||
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp
|
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp
|
||||||
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.hpp
|
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.hpp)
|
||||||
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.cpp
|
|
||||||
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.hpp)
|
|
||||||
|
|
||||||
target_link_libraries(aja-output-ui PRIVATE OBS::libobs OBS::frontend-api OBS::qt-wrappers OBS::qt-plain-text-edit
|
target_link_libraries(
|
||||||
Qt::Widgets AJA::LibAJANTV2)
|
aja-output-ui
|
||||||
|
PRIVATE OBS::libobs
|
||||||
|
OBS::frontend-api
|
||||||
|
OBS::qt-wrappers
|
||||||
|
OBS::qt-plain-text-edit
|
||||||
|
OBS::qt-vertical-scroll-area
|
||||||
|
Qt::Widgets
|
||||||
|
AJA::LibAJANTV2)
|
||||||
|
|
||||||
if(OS_MACOS)
|
if(OS_MACOS)
|
||||||
find_library(IOKIT_FRAMEWORK Iokit)
|
find_library(IOKIT_FRAMEWORK Iokit)
|
||||||
|
|
|
@ -24,6 +24,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")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
|
||||||
endif()
|
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()
|
||||||
|
|
||||||
if(NOT TARGET OBS::qt-wrappers)
|
if(NOT TARGET OBS::qt-wrappers)
|
||||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
||||||
endif()
|
endif()
|
||||||
|
@ -40,6 +45,7 @@ target_link_libraries(
|
||||||
PRIVATE OBS::libobs
|
PRIVATE OBS::libobs
|
||||||
OBS::frontend-api
|
OBS::frontend-api
|
||||||
OBS::qt-plain-text-edit
|
OBS::qt-plain-text-edit
|
||||||
|
OBS::qt-vertical-scroll-area
|
||||||
OBS::qt-wrappers
|
OBS::qt-wrappers
|
||||||
OBS::ui-support
|
OBS::ui-support
|
||||||
Qt::Widgets
|
Qt::Widgets
|
||||||
|
|
|
@ -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")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
|
||||||
endif()
|
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()
|
||||||
|
|
||||||
if(NOT TARGET OBS::qt-wrappers)
|
if(NOT TARGET OBS::qt-wrappers)
|
||||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
||||||
endif()
|
endif()
|
||||||
|
@ -44,12 +49,10 @@ target_sources(
|
||||||
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
|
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
|
||||||
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp
|
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp
|
||||||
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp
|
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp
|
||||||
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.hpp
|
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.hpp)
|
||||||
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.hpp
|
|
||||||
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.cpp)
|
|
||||||
|
|
||||||
target_link_libraries(decklink-output-ui PRIVATE OBS::libobs OBS::frontend-api OBS::qt-wrappers OBS::qt-plain-text-edit
|
target_link_libraries(decklink-output-ui PRIVATE OBS::libobs OBS::frontend-api OBS::qt-wrappers OBS::qt-plain-text-edit
|
||||||
Qt::Widgets)
|
OBS::qt-vertical-scroll-area Qt::Widgets)
|
||||||
|
|
||||||
target_compile_features(decklink-output-ui PRIVATE cxx_std_17)
|
target_compile_features(decklink-output-ui PRIVATE cxx_std_17)
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,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")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
|
||||||
endif()
|
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()
|
||||||
|
|
||||||
if(NOT TARGET OBS::qt-wrappers)
|
if(NOT TARGET OBS::qt-wrappers)
|
||||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
||||||
endif()
|
endif()
|
||||||
|
@ -54,6 +59,7 @@ target_link_libraries(
|
||||||
PRIVATE OBS::frontend-api
|
PRIVATE OBS::frontend-api
|
||||||
OBS::libobs
|
OBS::libobs
|
||||||
OBS::qt-plain-text-edit
|
OBS::qt-plain-text-edit
|
||||||
|
OBS::qt-vertical-scroll-area
|
||||||
OBS::qt-wrappers
|
OBS::qt-wrappers
|
||||||
OBS::ui-support
|
OBS::ui-support
|
||||||
Qt::Widgets
|
Qt::Widgets
|
||||||
|
|
|
@ -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")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
|
||||||
endif()
|
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()
|
||||||
|
|
||||||
if(NOT TARGET OBS::qt-wrappers)
|
if(NOT TARGET OBS::qt-wrappers)
|
||||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
|
||||||
endif()
|
endif()
|
||||||
|
@ -45,14 +50,12 @@ target_sources(
|
||||||
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
|
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
|
||||||
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp
|
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp
|
||||||
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp
|
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp
|
||||||
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.hpp
|
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.hpp)
|
||||||
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.hpp
|
|
||||||
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.cpp)
|
|
||||||
|
|
||||||
target_compile_features(frontend-tools PRIVATE cxx_std_17)
|
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::libobs
|
target_link_libraries(frontend-tools PRIVATE OBS::frontend-api OBS::qt-wrappers OBS::qt-plain-text-edit
|
||||||
Qt::Widgets)
|
OBS::qt-vertical-scroll-area OBS::libobs Qt::Widgets)
|
||||||
|
|
||||||
if(OS_POSIX AND NOT OS_MACOS)
|
if(OS_POSIX AND NOT OS_MACOS)
|
||||||
target_link_libraries(frontend-tools PRIVATE Qt::GuiPrivate)
|
target_link_libraries(frontend-tools PRIVATE Qt::GuiPrivate)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "vertical-scroll-area.hpp"
|
#include <vertical-scroll-area.hpp>
|
||||||
#include <obs-data.h>
|
#include <obs-data.h>
|
||||||
#include <obs.hpp>
|
#include <obs.hpp>
|
||||||
#include <qtimer.h>
|
#include <qtimer.h>
|
||||||
|
|
11
shared/qt/vertical-scroll-area/CMakeLists.txt
Normal file
11
shared/qt/vertical-scroll-area/CMakeLists.txt
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
cmake_minimum_required(VERSION 3.22...3.25)
|
||||||
|
|
||||||
|
find_package(Qt6 REQUIRED Core Widgets)
|
||||||
|
|
||||||
|
add_library(qt-vertical-scroll-area INTERFACE)
|
||||||
|
add_library(OBS::qt-vertical-scroll-area ALIAS qt-vertical-scroll-area)
|
||||||
|
|
||||||
|
target_sources(qt-vertical-scroll-area INTERFACE vertical-scroll-area.cpp vertical-scroll-area.hpp)
|
||||||
|
target_include_directories(qt-vertical-scroll-area INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||||
|
|
||||||
|
target_link_libraries(qt-vertical-scroll-area INTERFACE Qt::Core Qt::Widgets)
|
Loading…
Reference in a new issue