Library: resize the Played checkbox and BPM lock with the library font

res/skins/Deere/style.qss

@@ -264,12 +264,11 @@ WLibrary QLineEdit,
 }
 
 /* checkbox in library "Played" column */
-WTrackTableView::indicator:checked {
-  image: url(skin:/../Deere/icon/ic_library_checkmark.svg);
-  border: 1px solid #ff6600;
-}
 WTrackTableView::indicator:unchecked {
-  border: 1px solid rgba(151,151,151,128);
+  image: url(skin:/../Deere/icon/ic_library_checkbox.svg);
+}
+WTrackTableView::indicator:checked {
+  image: url(skin:/../Deere/icon/ic_library_checkbox_checked.svg);
 }
 
 /* focused BPM cell in the library "BPM" column */
@@ -2122,7 +2121,6 @@ WTrackMenu QMenu QCheckBox::indicator:disabled {
   background-color: #333;
 }
 WLibrarySidebar QMenu::indicator:checked,
-WTrackTableView::indicator:checked,
 WTrackMenu QMenu QCheckBox::indicator:checked {
   image: url(skin:/../Deere/icon/ic_library_checkmark_orange.svg);
 }
@@ -2158,8 +2156,6 @@ WLibrarySidebar QMenu::indicator:unchecked,
 WLibrarySidebar QMenu::indicator:unchecked:selected,
 WTrackTableViewHeader QMenu::indicator:unchecked,
 WTrackTableViewHeader QMenu::indicator:unchecked:selected,
-WTrackTableView::indicator:unchecked,
-WTrackTableView::indicator:unchecked:selected,
 WEffectSelector::indicator:unchecked,
 WEffectSelector::indicator:unchecked:selected,
 #fadeModeCombobox::indicator:unchecked,

res/skins/LateNight/style.qss

@@ -134,7 +134,8 @@ WEffectSelector QAbstractScrollArea {
     margin: 2px;
   }
   WEffectSelector::down-arrow,
-  #fadeModeCombobox::down-arrow {
+  #fadeModeCombobox::down-arrow,
+  WTrackTableView::indicator {
     border: 0;
     padding: 0;
     margin: 0;

res/skins/LateNight/style_classic.qss

@@ -2438,8 +2438,6 @@ QLineEdit QMenu::item:disabled {
   }
 
   WLibrarySidebar QMenu::indicator:checked,
-  WTrackTableViewHeader QMenu::indicator:checked,
-  WTrackTableView::indicator:checked,
   WTrackMenu QMenu QCheckBox::indicator:checked,
   WEffectSelector::indicator:checked,
   #fadeModeCombobox::indicator:checked {
@@ -2478,18 +2476,13 @@ QLineEdit QMenu::item:disabled {
 
 /* This is the only way to select the 'Played' checkbox.
   Note that this also selects the BPM lock. */
-WTrackTableView::indicator {
-  /* border is added to size defined in style.qss */
-  border: 1px solid transparent;
-  margin: 0px;
-  padding: 0px;
-  }
   WTrackTableView::indicator:checked {
-    border: 1px solid #ff6600;
+    image: url(skin:/classic/buttons/btn__lib_checkbox_checked.svg);
     }
   WTrackTableView::indicator:unchecked {
-    border: 1px solid rgba(151,151,151,128);
+    image: url(skin:/classic/buttons/btn__lib_checkbox.svg);
     }
+
   #MainMenu QMenu::separator,
   WLibrarySidebar QMenu::separator,
   WTrackTableViewHeader QMenu::separator,
@@ -2508,8 +2501,6 @@ WLibrarySidebar QMenu::indicator:unchecked,
 WLibrarySidebar QMenu::indicator:unchecked:selected,
 WTrackTableViewHeader QMenu::indicator:unchecked,
 WTrackTableViewHeader QMenu::indicator:unchecked:selected,
-WTrackTableView::indicator:unchecked,
-WTrackTableView::indicator:unchecked:selected,
 WEffectSelector::indicator:unchecked,
 WEffectSelector::indicator:unchecked:selected,
 #fadeModeCombobox::indicator:unchecked,

res/skins/LateNight/style_palemoon.qss

@@ -2496,18 +2496,6 @@ WTrackTableView {
   qproperty-focusBorderColor: #fff;
 }
 
-/* This is the only way to select the 'Played' checkbox.
-  Note that this also selects the BPM lock. */
-WTrackTableView::indicator {
-  /* border is added to configured size */
-  border: 1px solid transparent;
-  margin: 0px;
-  padding: 0px;
-  }
-  WTrackTableView::indicator:unchecked {
-    border: 1px solid rgba(151,151,151,128);
-  }
-
 /* Table cell in edit mode */
 WLibrary QLineEdit,
 #LibraryBPMSpinBox {
@@ -2922,12 +2910,15 @@ QLineEdit QMenu::item:disabled {
       image: url(skin:/palemoon/buttons/btn__menu_checkbox.svg);
     }
 
+  /* This is the only way to select the 'Played' checkbox.
+    Note that this also selects the BPM lock, so style that afterwards. */
+  WTrackTableView::indicator:unchecked {
+    image: url(skin:/palemoon/buttons/btn__lib_checkbox.svg);
+  }
   WLibrarySidebar QMenu::indicator:checked,
   WTrackTableViewHeader QMenu::indicator:checked,
   WTrackTableView::indicator:checked,
-  WTrackMenu QMenu QCheckBox::indicator:checked,
-  WEffectSelector::indicator:checked,
-  #fadeModeCombobox::indicator:checked {
+  WTrackMenu QMenu QCheckBox::indicator:checked {
     image: url(skin:/palemoon/buttons/btn__lib_checkmark_blue.svg);
   }
   WEffectSelector::indicator:checked,
@@ -2963,8 +2954,6 @@ WLibrarySidebar QMenu::indicator:unchecked,
 WLibrarySidebar QMenu::indicator:unchecked:selected,
 WTrackTableViewHeader QMenu::indicator:unchecked,
 WTrackTableViewHeader QMenu::indicator:unchecked:selected,
-WTrackTableView::indicator:unchecked,
-WTrackTableView::indicator:unchecked:selected,
 WEffectSelector::indicator:unchecked,
 WEffectSelector::indicator:unchecked:selected,
 #fadeModeCombobox::indicator:unchecked,

res/skins/Shade/style.qss

@@ -549,15 +549,13 @@ WTrackTableView {
   WTrackTableView::indicator {
     margin: 0px;
     padding: 0px;
-    color: #cfcfcf;
-    border: 1px solid transparent;
+    border: 0px;
     }
-    WTrackTableView::indicator:checked {
-      image: url(skin:/btn/btn_lib_checkmark.svg) no-repeat center center;
-      border: 1px solid #ff6600;
+  WTrackTableView::indicator:unchecked {
+    image: url(skin:/btn/btn_lib_checkbox.svg);
     }
-    WTrackTableView::indicator:unchecked {
-      border: 1px solid rgba(151,151,151,128);
+  WTrackTableView::indicator:checked {
+    image: url(skin:/btn/btn_lib_checkbox_checked.svg);
     }
 
 /* explicitly remove icons from unchecked items otherwise
@@ -566,8 +564,6 @@ WLibrarySidebar QMenu::indicator:unchecked,
 WLibrarySidebar QMenu::indicator:unchecked:selected,
 WTrackTableViewHeader QMenu::indicator:unchecked,
 WTrackTableViewHeader QMenu::indicator:unchecked:selected,
-WTrackTableView::indicator:unchecked,
-WTrackTableView::indicator:unchecked:selected,
 WEffectSelector::indicator:unchecked,
 WEffectSelector::indicator:unchecked:selected,
 #fadeModeCombobox::indicator:unchecked,

res/skins/Tango/style.qss

@@ -2902,21 +2902,11 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
     }*/
 
   /* checkbox in library "Played" column */
-  WTrackTableView::indicator {
-    margin: 0px;
-    padding: 0px;
-    color: #cfcfcf;
-    /* border is added to size defined above */
-    border: 1px solid rgba(151,151,151,128);
-    }
-  WTrackTableView::indicator:hover {
-      border: 1px solid #888;
-    }
   WTrackTableView::indicator:checked {
-    image: url(skin:/../Tango/buttons/btn_lib_checkmark.svg);
+    image: url(skin:/../Tango/buttons/btn_lib_checkbox_checked.svg);
     }
   WTrackTableView::indicator:unchecked {
-    background: none;
+    image: url(skin:/../Tango/buttons/btn_lib_checkbox.svg);
     }
 
 WLibrary QSpinBox {
@@ -2977,8 +2967,6 @@ WLibrarySidebar QMenu::indicator:unchecked,
 WLibrarySidebar QMenu::indicator:unchecked:selected,
 WTrackTableViewHeader QMenu::indicator:unchecked,
 WTrackTableViewHeader QMenu::indicator:unchecked:selected,
-WTrackTableView::indicator:unchecked,
-WTrackTableView::indicator:unchecked:selected,
 WEffectSelector::indicator:unchecked,
 WEffectSelector::indicator:unchecked:selected,
 #fadeModeCombobox::indicator:unchecked,

res/skins/default.qss

@@ -11,13 +11,12 @@
   image: url(:/images/library/ic_library_preview_play.svg);
 }
 
-/* These library table indicators are scaled with the library font:
-checkbox next to the 'Played' counter */
+/* 'Played' checkbox */
 WTrackTableView::indicator,
 /* BPM lock icon */
 #LibraryBPMButton::indicator {
-  width: 0.5em;
-  height: 0.5em;
+  /* The indicator size is dynamically adjusted in c++ to match the size
+  of the library font: width/height = 0.7em*/
 }
 /* Style the library BPM Button with a default image */
 QPushButton#LibraryBPMButton {

src/widget/wlibrarytableview.cpp

@@ -134,6 +134,17 @@ void WLibraryTableView::setTrackTableFont(const QFont& font) {
     setFont(font);
     QFontMetrics metrics(font);
     verticalHeader()->setMinimumSectionSize(metrics.height());
+    // Resize the 'Played' checkbox and the BPM lock icon.
+    // Note: this works well for library font sizes up to ~200% of the original
+    // system font's size (that set with Qt5 Settings respectively). Above that,
+    // the indicators start to overlap the item text because the painter rectangle
+    // is not resized (also depending on the system font size).
+    setStyleSheet(QStringLiteral(
+            "WTrackTableView::indicator,"
+            "#LibraryBPMButton::indicator {"
+            "height: %1px;"
+            "width: %1px;}")
+                          .arg(metrics.height() * 0.7));
 }
 
 void WLibraryTableView::setTrackTableRowHeight(int rowHeight) {