Skip to content
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

Skins: style main menubar #3788

Merged
merged 7 commits into from
May 2, 2021
Merged

Skins: style main menubar #3788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
775ebf7
Deere: style main menubar
ronso0 Apr 14, 2021
b2c1c61
LateNight: make the effect selector fit with all configurations
ronso0 Apr 16, 2021
ee2dd02
Tango: style main menubar
ronso0 Apr 16, 2021
1caf6f2
Shade: style main menubar
ronso0 Apr 17, 2021
1322088
WtrackMenu: name crates submenu to allow individual styling
ronso0 May 1, 2021
7cd6be0
Skins: clean up & consolidat menu all styles
ronso0 Apr 17, 2021
4ae2713
Skins: consolidate all common, platform-specific menu styles in one f…
ronso0 Apr 26, 2021
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
5 changes: 4 additions & 1 deletion res/skins/Deere (64 Samplers)/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@
</manifest>

<ObjectName>Mixxx</ObjectName>
<Style src="skin:../Deere/style.qss" src-mac="skin:../Deere/style-mac.qss"/>
<Style src="skin:../Deere/style.qss"
src-mac="skin:../Deere/style-mac.qss"
src-linux="skin:../default-menu-styles-linux.qss"
src-windows="skin:../default-menu-styles-windows.qss"/>

<Size>1008me,550me</Size>
<Layout>horizontal</Layout>
Expand Down
5 changes: 4 additions & 1 deletion res/skins/Deere/icon/ic_chevron_right_48px.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...skins/Deere/icon/ic_library_checkmark.svg → ...eere/icon/ic_library_checkmark_orange.svg
View file
Open in desktop
File renamed without changes
3 changes: 3 additions & 0 deletions res/skins/Deere/icon/ic_mainmenu_checkbox.svg
View file
Open in desktop
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 res/skins/Deere/icon/ic_mainmenu_checkbox_checked.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion res/skins/Deere/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@
</manifest>

<ObjectName>Mixxx</ObjectName>
<Style src="skin:../Deere/style.qss" src-mac="skin:../Deere/style-mac.qss"/>
<Style src="skin:../Deere/style.qss"
src-mac="skin:../Deere/style-mac.qss"
src-linux="skin:../default-menu-styles-linux.qss"
src-windows="skin:../default-menu-styles-windows.qss"/>

<Size>1008me,550me</Size>
<Layout>horizontal</Layout>
Expand Down
23 changes: 10 additions & 13 deletions res/skins/Deere/style-mac.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
/* push skin settings Close button to the left so it's not in the same screen
position as the Open button.
fixes lp1795663 "settings panel disappears instantly after opening it in Tango & Deere skin"
*/
/* push skin settings Close button to the left so it's not in
the same screen position as the Open button. Fixes lp1795663
"settings panel disappears instantly after opening it in Tango & Deere skin" */
#SkinSettingsTop {
padding-right: 27px;
}


/* Previously necessayr hack to hide the checkmark, otherwise text gets cut off
on the right on Retina screens. This can only be done for macOS
because it cuts off text on the left on KDE
WEffectSelector QAbstractItemView {
margin: 0 0 0 -24px;
/* Previously necessary hack to avoid cut-off effect names with scaled checkbox
on Macs with Retina screens */
/* WEffectSelector QAbstractItemView {
margin: 0px 0px 0px -27px;
} */

/* hide the checkmark just in case the above shows a
partial checkmark on some untested screen
WEffectSelector::indicator {
/* just in case there is a partial checkmark shown on some
untested screen, hide the checkmark */
/* WEffectSelector::indicator {
border: 0;
} */
Loading