Skip to content

Separation of the transitions dock from the main window #12743

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
tytan652 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Separation of the transitions dock from the main window #12743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab3dea3
frontend: Replace fade/cut transition pointer with UUIDs
tytan652 Oct 18, 2025
d19b985
frontend: Reorganize transition setter functions
tytan652 Oct 18, 2025
ee8cb8c
frontend: Move transition change events
tytan652 Oct 18, 2025
6a4c907
frontend: Add missing QSpinBox inclusion
tytan652 Oct 18, 2025
12496a5
frontend: Separate transitions dock from the main window
tytan652 Oct 19, 2025
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
2 changes: 1 addition & 1 deletion frontend/OBSStudioAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ obs_source_t *OBSStudioAPI::obs_frontend_get_current_transition()

void OBSStudioAPI::obs_frontend_set_current_transition(obs_source_t *transition)
{
QMetaObject::invokeMethod(main, "SetTransition", Q_ARG(OBSSource, OBSSource(transition)));
QMetaObject::invokeMethod(main, "studioAPISetTransition", Q_ARG(OBSSource, OBSSource(transition)));
}

int OBSStudioAPI::obs_frontend_get_transition_duration()
Expand Down
1 change: 1 addition & 0 deletions frontend/cmake/ui-qt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ target_sources(
forms/OBSBasicProperties.ui
forms/OBSBasicSettings.ui
forms/OBSBasicSourceSelect.ui
forms/OBSBasicTransitions.ui
forms/OBSBasicVCamConfig.ui
forms/OBSExtraBrowsers.ui
forms/OBSImporter.ui
Expand Down
2 changes: 2 additions & 0 deletions frontend/cmake/ui-widgets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ target_sources(
widgets/OBSBasicStats.hpp
widgets/OBSBasicStatusBar.cpp
widgets/OBSBasicStatusBar.hpp
widgets/OBSBasicTransitions.cpp
widgets/OBSBasicTransitions.hpp
widgets/OBSMainWindow.hpp
widgets/OBSProjector.cpp
widgets/OBSProjector.hpp
Expand Down
1 change: 1 addition & 0 deletions frontend/components/OBSAdvAudioCtrl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <qt-wrappers.hpp>

#include <QCheckBox>
#include <QSpinBox>

#include "moc_OBSAdvAudioCtrl.cpp"

Expand Down
232 changes: 0 additions & 232 deletions frontend/forms/OBSBasic.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1401,238 +1401,6 @@
</layout>
</widget>
</widget>
<widget class="OBSDock" name="transitionsDock">
<property name="features">
<set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
</property>
<property name="windowTitle">
<string>Basic.SceneTransitions</string>
</property>
<attribute name="dockWidgetArea">
<number>8</number>
</attribute>
<widget class="QWidget" name="dockWidgetContents_5">
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<item>
<widget class="QFrame" name="transitionsFrame">
<layout class="QVBoxLayout" name="verticalLayout_8">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QComboBox" name="transitions">
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="accessibleName">
<string>Transition</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>4</number>
</property>
<item>
<widget class="QLabel" name="transitionDurationLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Basic.TransitionDuration</string>
</property>
<property name="buddy">
<cstring>transitionDuration</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="transitionDuration">
<property name="accessibleName">
<string>Basic.TransitionDuration</string>
</property>
<property name="suffix">
<string> ms</string>
</property>
<property name="minimum">
<number>50</number>
</property>
<property name="maximum">
<number>20000</number>
</property>
<property name="singleStep">
<number>50</number>
</property>
<property name="value">
<number>300</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>4</number>
</property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="transitionAdd">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Basic.AddTransition</string>
</property>
<property name="accessibleName">
<string>Basic.AddTransition</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="obs.qrc">
<normaloff>:/res/images/plus.svg</normaloff>:/res/images/plus.svg</iconset>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="class" stdset="0">
<string notr="true">btn-tool icon-plus</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="transitionRemove">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Basic.RemoveTransition</string>
</property>
<property name="accessibleName">
<string>Basic.RemoveTransition</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="obs.qrc">
<normaloff>:/res/images/minus.svg</normaloff>:/res/images/minus.svg</iconset>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="class" stdset="0">
<string notr="true">btn-tool icon-trash</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="transitionProps">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Basic.TransitionProperties</string>
</property>
<property name="accessibleName">
<string>Basic.TransitionProperties</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="obs.qrc">
<normaloff>:/settings/images/settings/general.svg</normaloff>:/settings/images/settings/general.svg</iconset>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="class" stdset="0">
<string notr="true">btn-tool icon-dots-vert</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
<action name="actionAddScene">
<property name="icon">
<iconset resource="obs.qrc">
Expand Down
Loading
Loading