diff --git a/res/skins/Deere (64 Samplers)/skin.xml b/res/skins/Deere (64 Samplers)/skin.xml
index 4b0c4745f24..f4d4d5cfbd3 100644
--- a/res/skins/Deere (64 Samplers)/skin.xml
+++ b/res/skins/Deere (64 Samplers)/skin.xml
@@ -80,9 +80,9 @@
Mixxx
+ src-mac="skin:../Deere/style-mac.qss"
+ src-linux="skin:../default-menu-styles-linux.qss"
+ src-windows="skin:../default-menu-styles-windows.qss"/>
1008me,550me
horizontal
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index b51aebf3bcf..2edc824f9cf 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -79,9 +79,9 @@
Mixxx
+ src-mac="skin:../Deere/style-mac.qss"
+ src-linux="skin:../default-menu-styles-linux.qss"
+ src-windows="skin:../default-menu-styles-windows.qss"/>
1008me,550me
horizontal
diff --git a/res/skins/Deere/style-linux.qss b/res/skins/Deere/style-linux.qss
deleted file mode 100644
index 40bb651cea3..00000000000
--- a/res/skins/Deere/style-linux.qss
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#MainMenu::item {
-}
-#MainMenu QMenu::item {
- padding: 0.1em 0.3em 0.2em 0.3em;
- margin: 0em 0em 0em 1.4em;
- }
- /* Checkbox preceeding menu items */
- #MainMenu QMenu::indicator {
- /*width: 1em;*/
- /*height: 1em;*/
- margin: 0em -0.1em 0em -1.5em;
- padding: 0.2em 0em 0.2em 0em;
- }
- #MainMenu QMenu::indicator,
- #MainMenu QMenu::indicator:selected,
- #MainMenu QMenu::indicator:checked,
- #MainMenu QMenu::indicator:checked:selected {
- }
diff --git a/res/skins/Deere/style-mac.qss b/res/skins/Deere/style-mac.qss
index dadb01d01c8..c255b7b0ed8 100644
--- 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;
} */
diff --git a/res/skins/Deere/style-windows.qss b/res/skins/Deere/style-windows.qss
deleted file mode 100644
index 0903d020cd1..00000000000
--- a/res/skins/Deere/style-windows.qss
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#MainMenu::item {
-}
-#MainMenu QMenu::item {
- padding: 0.1em 0.3em 0.2em 0.3em;
- margin: 0em 0em 0em 1.2em;
- }
- /* Checkbox preceeding menu items */
- #MainMenu QMenu::indicator {
- /*width: 1em;*/
- /*height: 1em;*/
- margin: 0em 0em 0em -1.3em;
- padding: 0.3em 0em 0.3em 0.3em;
- }
- #MainMenu QMenu::indicator,
- #MainMenu QMenu::indicator:selected,
- #MainMenu QMenu::indicator:checked,
- #MainMenu QMenu::indicator:checked:selected {
- }
-
-/* Icons (copy, paste, ...) in context menus of
- - property cells in the tracks table
- - WCueMenuPopup cue label editor
- - WBeatSpinBox
- - AutoDJ transition QSpinBox */
-#LibraryContainer QMenu::icon,
-QLineEdit QMenu::icon,
-/* - checkbox in Crate name context menu
- "[ ] Auto DJ Track Source"
- - QHeaderView QMenu::indicator */
-#LibraryContainer QMenu::indicator {
- /* Linux: margin-right pushes the entire icon to the right !?? */
- margin: 0px -20px 0px 5px;
- }
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 43c925a82a6..fcd231c4e89 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -2137,16 +2137,18 @@ QLineEdit QMenu::separator {
border-top: 1px solid #0a0a0a;
}
+/* All menus that have at least one item with a checkbox*/
WLibrarySidebar QMenu::item,
WLibrary QHeaderView QMenu::item,
-WTrackMenu::item,
-WTrackMenu QMenu::item {
+#CratesMenu::item {
/* padding-right reserves space for the submenu expand arrow
padding-left should be bigger than the menu icon width +
icon margin-left/-right */
padding: 5px 12px 5px 26px;
}
+WTrackMenu::item,
+WTrackMenu QMenu::item,
/* This catches context menus of
- property cells in the tracks table
- WCueMenuPopup cue label editor
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index 1b073dae62f..0d468dd8fd0 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -282,8 +282,8 @@
Mixxx
+ src-linux="skin:../default-menu-styles-linux.qss"
+ src-windows="skin:../default-menu-styles-windows.qss"/>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 51acc0037d3..c850ed008bc 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -181,9 +181,10 @@ QLineEdit QMenu::separator {
margin: 4px;
}
+/* All menus that have at least one item with a checkbox*/
WLibrarySidebar QMenu::item,
WLibrary QHeaderView QMenu::item,
-WTrackMenu QMenu::item {
+#CratesMenu::item {
/* padding-right reserves space for the submenu expand arrow
padding-left should be bigger than the menu icon width +
icon margin-left/-right */
@@ -191,6 +192,7 @@ WTrackMenu QMenu::item {
}
WTrackMenu::item,
+WTrackMenu QMenu::item,
/* This catches context menus of
- property cells in the tracks table
- WCueMenuPopup cue label editor
diff --git a/res/skins/LateNight/style_linux.qss b/res/skins/LateNight/style_linux.qss
deleted file mode 100644
index 40bb651cea3..00000000000
--- a/res/skins/LateNight/style_linux.qss
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#MainMenu::item {
-}
-#MainMenu QMenu::item {
- padding: 0.1em 0.3em 0.2em 0.3em;
- margin: 0em 0em 0em 1.4em;
- }
- /* Checkbox preceeding menu items */
- #MainMenu QMenu::indicator {
- /*width: 1em;*/
- /*height: 1em;*/
- margin: 0em -0.1em 0em -1.5em;
- padding: 0.2em 0em 0.2em 0em;
- }
- #MainMenu QMenu::indicator,
- #MainMenu QMenu::indicator:selected,
- #MainMenu QMenu::indicator:checked,
- #MainMenu QMenu::indicator:checked:selected {
- }
diff --git a/res/skins/LateNight/style_windows.qss b/res/skins/LateNight/style_windows.qss
deleted file mode 100644
index 0903d020cd1..00000000000
--- a/res/skins/LateNight/style_windows.qss
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#MainMenu::item {
-}
-#MainMenu QMenu::item {
- padding: 0.1em 0.3em 0.2em 0.3em;
- margin: 0em 0em 0em 1.2em;
- }
- /* Checkbox preceeding menu items */
- #MainMenu QMenu::indicator {
- /*width: 1em;*/
- /*height: 1em;*/
- margin: 0em 0em 0em -1.3em;
- padding: 0.3em 0em 0.3em 0.3em;
- }
- #MainMenu QMenu::indicator,
- #MainMenu QMenu::indicator:selected,
- #MainMenu QMenu::indicator:checked,
- #MainMenu QMenu::indicator:checked:selected {
- }
-
-/* Icons (copy, paste, ...) in context menus of
- - property cells in the tracks table
- - WCueMenuPopup cue label editor
- - WBeatSpinBox
- - AutoDJ transition QSpinBox */
-#LibraryContainer QMenu::icon,
-QLineEdit QMenu::icon,
-/* - checkbox in Crate name context menu
- "[ ] Auto DJ Track Source"
- - QHeaderView QMenu::indicator */
-#LibraryContainer QMenu::indicator {
- /* Linux: margin-right pushes the entire icon to the right !?? */
- margin: 0px -20px 0px 5px;
- }
diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml
index 32236daf7c8..20998cdb980 100644
--- a/res/skins/Shade/skin.xml
+++ b/res/skins/Shade/skin.xml
@@ -217,9 +217,8 @@
-->
Mixxx
+ src-linux="skin:../default-menu-styles-linux.qss"
+ src-windows="skin:../default-menu-styles-windows.qss"/>
1008e,500e
vertical
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 01972ef0c98..22408e89fda 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -392,16 +392,18 @@ WEffectSelector QAbstractScrollArea,
border-color: #666;
}
+/* All menus that have at least one item with a checkbox*/
WLibrarySidebar QMenu::item,
WLibrary QHeaderView QMenu::item,
-WTrackMenu::item,
-WTrackMenu QMenu::item {
+#CratesMenu::item {
/* padding-right reserves space for the submenu expand arrow
padding-left should be bigger than the menu icon width +
icon margin-left/-right */
padding: 5px 12px 5px 26px;
}
+WTrackMenu::item,
+WTrackMenu QMenu::item,
/* This catches context menus of
- property cells in the tracks table
- WCueMenuPopup cue label editor
diff --git a/res/skins/Shade/style_linux.qss b/res/skins/Shade/style_linux.qss
deleted file mode 100644
index 40bb651cea3..00000000000
--- a/res/skins/Shade/style_linux.qss
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#MainMenu::item {
-}
-#MainMenu QMenu::item {
- padding: 0.1em 0.3em 0.2em 0.3em;
- margin: 0em 0em 0em 1.4em;
- }
- /* Checkbox preceeding menu items */
- #MainMenu QMenu::indicator {
- /*width: 1em;*/
- /*height: 1em;*/
- margin: 0em -0.1em 0em -1.5em;
- padding: 0.2em 0em 0.2em 0em;
- }
- #MainMenu QMenu::indicator,
- #MainMenu QMenu::indicator:selected,
- #MainMenu QMenu::indicator:checked,
- #MainMenu QMenu::indicator:checked:selected {
- }
diff --git a/res/skins/Shade/style_mac.qss b/res/skins/Shade/style_mac.qss
deleted file mode 100644
index c1bffb54f21..00000000000
--- a/res/skins/Shade/style_mac.qss
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Previously necessary hack around text getting cut off with scaled checkbox on Macs with Retina screens
-WEffectSelector QAbstractItemView {
- margin: 0px 0px 0px -27px;
-} */
-
-/* just in case there is a partial checkmark shown on some untested screen, hide
-the checkmark
-WEffectSelector::indicator {
- border: 0;
-} */
diff --git a/res/skins/Shade/style_windows.qss b/res/skins/Shade/style_windows.qss
deleted file mode 100644
index 0903d020cd1..00000000000
--- a/res/skins/Shade/style_windows.qss
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#MainMenu::item {
-}
-#MainMenu QMenu::item {
- padding: 0.1em 0.3em 0.2em 0.3em;
- margin: 0em 0em 0em 1.2em;
- }
- /* Checkbox preceeding menu items */
- #MainMenu QMenu::indicator {
- /*width: 1em;*/
- /*height: 1em;*/
- margin: 0em 0em 0em -1.3em;
- padding: 0.3em 0em 0.3em 0.3em;
- }
- #MainMenu QMenu::indicator,
- #MainMenu QMenu::indicator:selected,
- #MainMenu QMenu::indicator:checked,
- #MainMenu QMenu::indicator:checked:selected {
- }
-
-/* Icons (copy, paste, ...) in context menus of
- - property cells in the tracks table
- - WCueMenuPopup cue label editor
- - WBeatSpinBox
- - AutoDJ transition QSpinBox */
-#LibraryContainer QMenu::icon,
-QLineEdit QMenu::icon,
-/* - checkbox in Crate name context menu
- "[ ] Auto DJ Track Source"
- - QHeaderView QMenu::indicator */
-#LibraryContainer QMenu::indicator {
- /* Linux: margin-right pushes the entire icon to the right !?? */
- margin: 0px -20px 0px 5px;
- }
diff --git a/res/skins/Tango (64 Samplers)/skin.xml b/res/skins/Tango (64 Samplers)/skin.xml
index 08f8a652e91..98b477b9b1a 100644
--- a/res/skins/Tango (64 Samplers)/skin.xml
+++ b/res/skins/Tango (64 Samplers)/skin.xml
@@ -127,9 +127,9 @@
Mixxx
+ src-mac="skin:../Tango/style-mac.qss"
+ src-linux="skin:../default-menu-styles-linux.qss"
+ src-windows="skin:../default-menu-styles-windows.qss"/>
1008,500
me,me
vertical
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index e52836467d4..8ea4e2920ae 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -121,9 +121,9 @@
Mixxx
+ src-mac="skin:../Tango/style-mac.qss"
+ src-linux="skin:../default-menu-styles-linux.qss"
+ src-windows="skin:../default-menu-styles-windows.qss"/>
1008,500
me,me
vertical
diff --git a/res/skins/Tango/style-linux.qss b/res/skins/Tango/style-linux.qss
deleted file mode 100644
index 40bb651cea3..00000000000
--- a/res/skins/Tango/style-linux.qss
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#MainMenu::item {
-}
-#MainMenu QMenu::item {
- padding: 0.1em 0.3em 0.2em 0.3em;
- margin: 0em 0em 0em 1.4em;
- }
- /* Checkbox preceeding menu items */
- #MainMenu QMenu::indicator {
- /*width: 1em;*/
- /*height: 1em;*/
- margin: 0em -0.1em 0em -1.5em;
- padding: 0.2em 0em 0.2em 0em;
- }
- #MainMenu QMenu::indicator,
- #MainMenu QMenu::indicator:selected,
- #MainMenu QMenu::indicator:checked,
- #MainMenu QMenu::indicator:checked:selected {
- }
diff --git a/res/skins/Tango/style-mac.qss b/res/skins/Tango/style-mac.qss
index dd673acb3d4..fb037d2c57e 100644
--- a/res/skins/Tango/style-mac.qss
+++ b/res/skins/Tango/style-mac.qss
@@ -1,18 +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" */
#SkinSettingsHeader {
padding-right: 27px;
}
-/* Previously necessary hack around text getting cut off with scaled checkbox on Macs with Retina screens
-WEffectSelector QAbstractItemView {
- margin: 0px 0px 0px -27px;
+/* Previously necessary hack to avoid cut-off effect names with scaled checkbox
+ on Macs with Retina screens */
+/* WEffectSelector QAbstractItemView {
+ margin: 0px 0px 0px -27px;
} */
-/* just in case there is a partial checkmark shown on some untested screen, hide
-the checkmark
-WEffectSelector::indicator {
+/* just in case there is a partial checkmark shown on some
+ untested screen, hide the checkmark */
+/* WEffectSelector::indicator {
border: 0;
} */
diff --git a/res/skins/Tango/style-windows.qss b/res/skins/Tango/style-windows.qss
deleted file mode 100644
index 0903d020cd1..00000000000
--- a/res/skins/Tango/style-windows.qss
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#MainMenu::item {
-}
-#MainMenu QMenu::item {
- padding: 0.1em 0.3em 0.2em 0.3em;
- margin: 0em 0em 0em 1.2em;
- }
- /* Checkbox preceeding menu items */
- #MainMenu QMenu::indicator {
- /*width: 1em;*/
- /*height: 1em;*/
- margin: 0em 0em 0em -1.3em;
- padding: 0.3em 0em 0.3em 0.3em;
- }
- #MainMenu QMenu::indicator,
- #MainMenu QMenu::indicator:selected,
- #MainMenu QMenu::indicator:checked,
- #MainMenu QMenu::indicator:checked:selected {
- }
-
-/* Icons (copy, paste, ...) in context menus of
- - property cells in the tracks table
- - WCueMenuPopup cue label editor
- - WBeatSpinBox
- - AutoDJ transition QSpinBox */
-#LibraryContainer QMenu::icon,
-QLineEdit QMenu::icon,
-/* - checkbox in Crate name context menu
- "[ ] Auto DJ Track Source"
- - QHeaderView QMenu::indicator */
-#LibraryContainer QMenu::indicator {
- /* Linux: margin-right pushes the entire icon to the right !?? */
- margin: 0px -20px 0px 5px;
- }
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 7a97d9e92ed..946376ed900 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2184,16 +2184,18 @@ WEffectSelector::indicator:unchecked,
margin-right: 0.2em;
}
+/* All menus that have at least one item with a checkbox*/
WLibrarySidebar QMenu::item,
WLibrary QHeaderView QMenu::item,
-WTrackMenu::item,
-WTrackMenu QMenu::item {
+#CratesMenu::item {
/* padding-right reserves space for the submenu expand arrow
padding-left should be bigger than the menu icon width +
icon margin-left/-right */
padding: 5px 12px 5px 26px;
}
+WTrackMenu::item,
+WTrackMenu QMenu::item,
/* This catches context menus of
- property cells in the tracks table
- WCueMenuPopup cue label editor
diff --git a/res/skins/default-menu-styles-linux.qss b/res/skins/default-menu-styles-linux.qss
new file mode 100644
index 00000000000..67193916590
--- /dev/null
+++ b/res/skins/default-menu-styles-linux.qss
@@ -0,0 +1,25 @@
+
+#MainMenu::item {
+ /* Don't touch except font and bg color.
+ Should automatically look like the native menus. */
+ /*padding: 0.1em 0.3em 0.1em 0.3em;*/
+ /*margin: 0em;*/
+}
+#MainMenu QMenu::item {
+ padding: 0.1em 0.3em 0.2em 0.3em;
+ /* Text and checkbox are left-aligned with checkbox = overlap
+ margin-left: moves icon & text to the right, so they still overlap
+ but we now have space for the checkbox */
+ margin: 0em 0em 0em 1.3em;
+ }
+ /* Checkbox preceeding menu items */
+ #MainMenu QMenu::indicator {
+ /*width: 1em;*/
+ /*height: 1em;*/
+ /* margin-left: negative to move the checkbox left into the gap
+ we created with the item's padding-left
+ margin-right: negative to eliminate the tiny margin between
+ checkbox and text (visible when the row is highlighted) */
+ margin: 0em -0.1em 0em -1.3em;
+ padding: 0.2em 0em 0.2em 0em;
+ }
diff --git a/res/skins/default-menu-styles-windows.qss b/res/skins/default-menu-styles-windows.qss
new file mode 100644
index 00000000000..d3d84a3d638
--- /dev/null
+++ b/res/skins/default-menu-styles-windows.qss
@@ -0,0 +1,25 @@
+
+#MainMenu::item {
+ /* Don't touch except font and bg color.
+ Should automatically look like the native menus. */
+ /*padding: 0.1em 0.3em 0.1em 0.3em;*/
+ /*margin: 0em;*/
+}
+#MainMenu QMenu::item {
+ padding: 0.1em 0.3em 0.2em 0.3em;
+ /* Text and checkbox are left-aligned with checkbox = overlap
+ margin-left: moves icon & text to the right, so they still overlap
+ but we now have space for the checkbox */
+ margin: 0em 0em 0em 1.2em;
+ }
+ /* Checkbox preceeding menu items */
+ #MainMenu QMenu::indicator {
+ /*width: 1em;*/
+ /*height: 1em;*/
+ /* margin-left: negative to move the checkbox left into the gap
+ we created with the item's padding-left
+
+ */
+ margin: 0em 0em 0em -1.3em;
+ padding: 0.3em 0em 0.3em 0.3em;
+ }