Skip to content

Commit

Permalink
UI: Redesign status bar
Browse files Browse the repository at this point in the history
This redesigns the status bar to look more modern.

Co-authored-by: Warchamp7 <[email protected]>
Co-authored-by: Georges Basile Stavracas Neto <[email protected]>
  • Loading branch information
3 people authored and Lain-B committed Jul 20, 2023
1 parent 9d611a0 commit 1c84071
Show file tree
Hide file tree
Showing 29 changed files with 891 additions and 369 deletions.
1 change: 1 addition & 0 deletions UI/cmake/legacy.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ target_sources(
forms/OBSRemux.ui
forms/OBSUpdate.ui
forms/OBSYoutubeActions.ui
forms/StatusBarWidget.ui
forms/source-toolbar/browser-source-toolbar.ui
forms/source-toolbar/color-source-toolbar.ui
forms/source-toolbar/device-select-toolbar.ui
Expand Down
14 changes: 13 additions & 1 deletion UI/data/themes/Acri.qss
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,20 @@ QScrollArea {
border-radius: 4px;
}

/* Qt enforces a padding inside its status bar, so we
* oversize it and use margin to crunch it back down
*/
OBSBasicStatusBar {
margin-top: 8px;
margin-top: 4px;
border-top: 1px solid #3c404b;
background: palette(dark);
}

StatusBarWidget > QFrame {
margin-top: 1px;
border: 0px solid #3c404b;
border-left-width: 1px;
padding: 0px 12px 2px;
}

/* Group Box */
Expand Down
16 changes: 16 additions & 0 deletions UI/data/themes/Dark.qss
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,22 @@ QStatusBar::item {
border: none;
}

/* Qt enforces a padding inside its status bar, so we
* oversize it and use margin to crunch it back down
*/
OBSBasicStatusBar {
margin-top: 4px;
border-top: 1px solid palette(dark);
background: palette(window);
}

StatusBarWidget > QFrame {
margin-top: 2px;
border: 0px solid palette(dark);
border-left-width: 1px;
padding: 0px 12px 4px;
}

/* Table View */

QTableView {
Expand Down
7 changes: 7 additions & 0 deletions UI/data/themes/Dark/network-disconnected.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions UI/data/themes/Dark/network-inactive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions UI/data/themes/Dark/recording-inactive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions UI/data/themes/Dark/recording-pause-inactive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions UI/data/themes/Dark/streaming-inactive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 13 additions & 1 deletion UI/data/themes/Grey.qss
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,20 @@ QScrollArea {
border-radius: 4px;
}

/* Qt enforces a padding inside its status bar, so we
* oversize it and use margin to crunch it back down
*/
OBSBasicStatusBar {
margin-top: 8px;
margin-top: 4px;
border-top: 1px solid #3c404b;
background: palette(dark);
}

StatusBarWidget > QFrame {
margin-top: 1px;
border: 0px solid #3c404b;
border-left-width: 1px;
padding: 0px 12px 2px;
}

/* Group Box */
Expand Down
14 changes: 13 additions & 1 deletion UI/data/themes/Light.qss
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,20 @@ QScrollArea {
border-radius: 4px;
}

/* Qt enforces a padding inside its status bar, so we
* oversize it and use margin to crunch it back down
*/
OBSBasicStatusBar {
margin-top: 8px;
margin-top: 4px;
border-top: 1px solid rgb(192,192,192);
background: palette(dark);
}

StatusBarWidget > QFrame {
margin-top: 1px;
border: 0px solid rgb(192,192,192);
border-left-width: 1px;
padding: 0px 12px 2px;
}

/* Group Box */
Expand Down
14 changes: 13 additions & 1 deletion UI/data/themes/Rachni.qss
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,20 @@ QScrollArea {
border-radius: 4px;
}

/* Qt enforces a padding inside its status bar, so we
* oversize it and use margin to crunch it back down
*/
OBSBasicStatusBar {
margin-top: 8px;
margin-top: 4px;
border-top: 1px solid #3c404b;
background: palette(dark);
}

StatusBarWidget > QFrame {
margin-top: 1px;
border: 0px solid #3c404b;
border-left-width: 1px;
padding: 0px 12px 2px;
}

/* Group Box */
Expand Down
5 changes: 5 additions & 0 deletions UI/data/themes/System.qss
Original file line number Diff line number Diff line change
Expand Up @@ -402,3 +402,8 @@ QCalendarWidget #qt_calendar_nextmonth {
qproperty-icon: url(./Dark/right.svg);
icon-size: 16px, 16px;
}

/* Status Bar */
StatusBarWidget > QFrame {
padding: 0px 12px 8px;
}
14 changes: 13 additions & 1 deletion UI/data/themes/Yami.qss
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,20 @@ QScrollArea {
border-radius: 4px;
}

/* Qt enforces a padding inside its status bar, so we
* oversize it and use margin to crunch it back down
*/
OBSBasicStatusBar {
margin-top: 8px;
margin-top: 4px;
border-top: 1px solid #3c404b;
background: palette(dark);
}

StatusBarWidget > QFrame {
margin-top: 1px;
border: 0px solid #3c404b;
border-left-width: 1px;
padding: 0px 12px 2px;
}

/* Group Box */
Expand Down
Loading

0 comments on commit 1c84071

Please sign in to comment.