Skip to content

frontend: Move Preview into dock widget #12190

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

Draft
Warchamp7 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

frontend: Move Preview into dock widget #12190

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
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 @@ -344,7 +344,7 @@ bool OBSStudioAPI::obs_frontend_add_dock_by_id(const char *id, const char *title
dock->setWindowTitle(QT_UTF8(title));
dock->setObjectName(QT_UTF8(id));

main->AddDockWidget(dock, Qt::RightDockWidgetArea);
main->addDockWidget(Qt::BottomDockWidgetArea, dock);

dock->setVisible(false);
dock->setFloating(true);
Expand Down
1 change: 0 additions & 1 deletion frontend/data/locale/en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,6 @@ Basic.MainMenu.View.SceneListMode="Scene List Mode"
Basic.MainMenu.Docks="&Docks"
Basic.MainMenu.Docks.ResetDocks="&Reset Docks"
Basic.MainMenu.Docks.LockDocks="&Lock Docks"
Basic.MainMenu.Docks.SideDocks="&Full-Height Docks"
Basic.MainMenu.Docks.CustomBrowserDocks="&Custom Browser Docks"

# basic mode profile/scene collection menus
Expand Down
124 changes: 79 additions & 45 deletions frontend/data/themes/Yami.obt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,20 @@ OBSDock QToolBar QToolButton:disabled {
background: var(--grey7);
}

/* Reset styling for the preview dock */
#previewDock > QWidget {
background: var(--bg_base);
border-radius: var(--border_radius);
border: none;
border: 1px solid var(--border_color);
}

#previewFrame {
background: var(--grey7);
margin-top: var(--spacing_large);
border: 1px solid var(--grey7);
}

#transitionsFrame {
padding: var(--padding_container);
}
Expand Down Expand Up @@ -1039,6 +1053,9 @@ OBSDock QScrollBar:vertical {
background-color: var(--bg_base);
margin-top: 4px;
border-radius: var(--border_radius);
margin-bottom: var(--spacing_base);
border-bottom-left-radius: var(--border_radius);
border-bottom-right-radius: var(--border_radius);
}

#contextContainer QPushButton {
Expand Down Expand Up @@ -2330,89 +2347,106 @@ OBSBasicAdvAudio #scrollAreaWidgetContents {
background: var(--bg_base);
}

#previewScalePercent,
#previewXContainer {
border-top: 1px solid var(--grey6);
max-height: var(--input_height_half);
padding: 0;
color: var(--text_muted);
}

#previewZoomOutButton,
#previewZoomInButton,
#previewScalingMode {
background: transparent;
color: var(--text_muted);
font-size: var(--font_xsmall);
height: 14px;
max-height: 14px;
height: var(--input_height_half);
max-height: var(--input_height_half);
padding: 0px;
margin: 0;
border: none;
border: 1px solid transparent;
border-radius: 0;
}

#previewXContainer {
border: 1px solid var(--grey6);
#previewScalingMode,
#previewScalePercent {
color: var(--text_muted);
font-size: var(--font_xsmall);
}

#previewScalePercent {
padding: 0px var(--input_text_padding);
min-width: var(--preview_scale_width);
#previewZoomOutButton,
#previewZoomInButton {
padding: 0px var(--padding_large);
}

#previewScalingMode {
padding: 0px var(--input_text_padding);
border: 1px solid var(--grey6);
border-left-color: var(--grey6);
border-right-color: var(--grey6);
}

#previewScalingMode:hover,
#previewScalingMode:focus {
border-color: var(--input_border_hover);
#previewScalingMode QAbstractItemView {
padding: 0;
}

#previewScalingMode:on {
background-color: var(--input_bg_focus);
border-color: var(--input_border_focus);
#previewScalingMode QAbstractItemView::item {
height: var(--input_height_half);
padding: var(--padding_base) var(--padding_large);
border-radius: var(--border_radius_small);
}

#previewXScrollBar,
#previewYScrollBar {
background: transparent;
border: 1px solid var(--grey6);
border-radius: 0;
#previewZoomOutButton:hover,
#previewZoomInButton:hover,
#previewScalingMode:hover {
background-color: var(--grey6);
border-color: transparent;
color: var(--white3);
}

#previewXScrollBar {
border-left: none;
height: 16px;
#previewZoomOutButton:pressed,
#previewZoomInButton:pressed,
#previewScalingMode:pressed {
background-color: var(--button_down);
}

#previewXScrollBar::handle,
#previewYScrollBar::handle {
margin: 3px;
#previewZoomOutButton:focus,
#previewZoomInButton:focus,
#previewScalingMode:focus {
border-color: var(--input_border_hover);
}

#previewYScrollBar {
width: 16px;
#previewScalingMode:on {
background-color: var(--input_bg_focus);
border-color: var(--input_border_focus);
}

#previewZoomInButton {
border: none;
border-radius: 0px;
outline: none;
#previewScalePercent {
padding: 0px var(--input_text_padding);
min-width: var(--preview_scale_width);
}

#previewZoomOutButton {
#previewContainer QScrollBar {
background: transparent;
border: none;
border-radius: 0px;
outline: none;
border-radius: 0;
margin: 0;
}

#previewZoomInButton:!hover,
#previewZoomOutButton:!hover {
background-color: transparent;
#previewContainer QScrollBar::handle {
margin: 3px;
}

#previewZoomInButton:pressed,
#previewZoomOutButton:pressed {
background-color: var(--button_bg);
#previewContainer QScrollBar::handle:pressed {
background-color: var(--grey6);
}

#previewZoomInButton:focus,
#previewZoomOutButton:focus {
border: 1px solid var(--input_border_hover);
#previewContainer #previewXScrollBar {
height: 16px;
}

#previewContainer #previewYScrollBar {
width: 16px;
border-left: 1px solid var(--grey6);
}

/* Idian Widgets */
Expand Down
2 changes: 1 addition & 1 deletion frontend/docks/YouTubeAppDock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void YouTubeAppDock::AddYouTubeAppDock()
this->setMinimumSize(400, 300);
this->setAllowedAreas(Qt::AllDockWidgetAreas);

OBSBasic::Get()->AddDockWidget(this, Qt::RightDockWidgetArea);
OBSBasic::Get()->addDockWidget(Qt::RightDockWidgetArea, this);

if (IsYTServiceSelected()) {
const std::string url = InitYTUserUrl();
Expand Down
Loading
Loading