Merge pull request #3788 from ronso0/mainmenu23

Skins: style main menubar
mixxxdj · May 2, 2021 · a146898 · a146898
2 parents 00b5b27 + 4ae2713
commit a146898
Show file tree

Hide file tree

Showing 49 changed files with 1,745 additions and 1,588 deletions.
diff --git a/res/skins/Deere (64 Samplers)/skin.xml b/res/skins/Deere (64 Samplers)/skin.xml
@@ -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>

diff --git a/res/skins/Deere/icon/ic_chevron_right_48px.svg b/res/skins/Deere/icon/ic_chevron_right_48px.svg
diff --git a/...skins/Deere/icon/ic_library_checkmark.svg → ...eere/icon/ic_library_checkmark_orange.svg b/...skins/Deere/icon/ic_library_checkmark.svg → ...eere/icon/ic_library_checkmark_orange.svg
diff --git a/res/skins/Deere/icon/ic_mainmenu_checkbox.svg b/res/skins/Deere/icon/ic_mainmenu_checkbox.svg
diff --git a/res/skins/Deere/icon/ic_mainmenu_checkbox_checked.svg b/res/skins/Deere/icon/ic_mainmenu_checkbox_checked.svg
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
@@ -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>

diff --git a/res/skins/Deere/style-mac.qss b/res/skins/Deere/style-mac.qss
@@ -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;
 } */