Skip to content

Commit 038d6fb

Browse files
committed
UI: Separate controls dock from the main window
Moves the controls dock UI outside of the main window UI. OBSBasic still rely on UI element from the controls dock.
1 parent 361ef30 commit 038d6fb

11 files changed

Lines changed: 957 additions & 727 deletions

UI/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ target_sources(
9898
forms/OBSAbout.ui
9999
forms/OBSAdvAudio.ui
100100
forms/OBSBasic.ui
101+
forms/OBSBasicControls.ui
101102
forms/OBSBasicFilters.ui
102103
forms/OBSBasicInteraction.ui
103104
forms/OBSBasicSettings.ui
@@ -191,8 +192,6 @@ target_sources(
191192
properties-view.cpp
192193
properties-view.hpp
193194
properties-view.moc.hpp
194-
record-button.cpp
195-
record-button.hpp
196195
remote-text.cpp
197196
remote-text.hpp
198197
scene-tree.cpp
@@ -223,7 +222,10 @@ target_sources(
223222

224223
target_sources(
225224
obs
226-
PRIVATE window-basic-about.cpp
225+
PRIVATE basic-controls.cpp
226+
basic-controls.hpp
227+
basic-controls-button.hpp
228+
window-basic-about.cpp
227229
window-basic-about.hpp
228230
window-basic-auto-config.cpp
229231
window-basic-auto-config.hpp

UI/basic-controls-button.hpp

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#pragma once
2+
3+
#include <QPushButton>
4+
#include <QResizeEvent>
5+
6+
class OBSBasicControls;
7+
8+
class OBSBasicControlsButton : public QPushButton {
9+
Q_OBJECT
10+
public:
11+
inline OBSBasicControlsButton(QWidget *parent = nullptr)
12+
: QPushButton(parent)
13+
{
14+
}
15+
inline OBSBasicControlsButton(const QString &text,
16+
QWidget *parent = nullptr)
17+
: QPushButton(text, parent)
18+
{
19+
}
20+
21+
inline virtual void resizeEvent(QResizeEvent *event) override
22+
{
23+
emit ResizeEvent();
24+
event->accept();
25+
}
26+
27+
signals:
28+
void ResizeEvent();
29+
};

0 commit comments

Comments
 (0)