Skip to content

Commit

Permalink
Merge pull request #3958 from ronso0/qssfontleaks
Browse files Browse the repository at this point in the history 
Skins: fix remaining 'font leaks'
  • Loading branch information
@daschuer
daschuer authored Jun 7, 2021
2 parents a5bc82a + c8c6a0e commit 827c8c2
Show file tree
Hide file tree
Showing 8 changed files with 384 additions and 375 deletions.
136 changes: 66 additions & 70 deletions res/skins/Deere/style.qss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@
*******************************************************************************/

/* sidebar, as well as root items for playlists, crates, and history */
#LibraryContainer QTextBrowser,
#LibraryContainer QTableView,
#LibraryContainer QTreeView {
WLibraryTextBrowser,
WTrackTableView,
WLibrarySidebar {
color: #d2d2d2;
border: 1px solid #1A1A1A;
background-color: #1F1F1F;
Expand All @@ -219,20 +219,17 @@
}

/* Selected rows in Tree and Tracks table */
#LibraryContainer QTableView::item:selected,
#LibraryContainer QTreeView::item:selected,
WTrackTableView::item:selected,
WLibrarySidebar::item:selected,
#LibraryBPMButton::item:selected {
color: #D6D6D6;
background-color: #006596;
}
#LibraryContainer QTreeView::item:focus {
outline: none;
}
/* Use the native focus decoration */
/* This is for all cells including Played and Location */
#LibraryContainer QTableView,
WTrackTableView,
/* This is for the BPM cell */
#LibraryContainer QTableView QCheckBox:focus {
WTrackTableView QCheckBox:focus {
outline: 1px solid #D6D6D6;
}
/* This uses a custom qproperty to set the focus border
Expand All @@ -242,13 +239,13 @@ WTrackTableView {
qproperty-focusBorderColor: #D6D6D6;
}

#LibraryContainer QTableView:focus,
#LibraryContainer QTreeView:focus,
#LibraryContainer QTextBrowser:focus {
WTrackTableView:focus,
WLibrarySidebar:focus,
WLibraryTextBrowser:focus {
border: 1px solid #FF6600;
}

QTextBrowser {
WLibraryTextBrowser {
padding-left: 5px;
}

Expand All @@ -268,11 +265,11 @@ WLibrary QLineEdit,


/* checkbox in library "Played" column */
#LibraryContainer QTableView::indicator:checked {
WTrackTableView::indicator:checked {
image: url(skin:/../Deere/icon/ic_library_checkmark.svg);
border: 1px solid #ff6600;
}
#LibraryContainer QTableView::indicator:unchecked {
WTrackTableView::indicator:unchecked {
border: 1px solid rgba(151,151,151,128);
}

Expand Down Expand Up @@ -334,14 +331,14 @@ QPushButton#LibraryPreviewButton:checked:hover {
}

/* library header row */
#LibraryContainer QHeaderView {
WTrackTableViewHeader {
/* Don't set a font size to pick up the system font size. */
color: #d2d2d2;
background-color: #1A1A1A;
border-bottom: 1px solid #141414;
}

#LibraryContainer QHeaderView::section {
WTrackTableViewHeader::section {
height: 1.1em;
font-weight: bold;
padding: 2px;
Expand All @@ -352,16 +349,16 @@ QPushButton#LibraryPreviewButton:checked:hover {
border-right: 1px solid #141414;
}

#LibraryContainer QHeaderView::up-arrow,
#LibraryContainer QHeaderView::down-arrow {
WTrackTableViewHeader::up-arrow,
WTrackTableViewHeader::down-arrow {
background-color: rgba(26,26,26,220);
padding: 0px;
}
#LibraryContainer QHeaderView::up-arrow {
WTrackTableViewHeader::up-arrow {
image: url(skin:/../Deere/image/style_sort_up.svg);
}

#LibraryContainer QHeaderView::down-arrow {
WTrackTableViewHeader::down-arrow {
image: url(skin:/../Deere/image/style_sort_down.svg);
}

Expand Down Expand Up @@ -412,8 +409,8 @@ WSearchLineEdit {
qproperty-layoutSpacing: 0;
}

#LibraryContainer QTreeView,
#LibraryContainer QTreeView::item:focus {
WLibrarySidebar,
WLibrarySidebar::item:focus {
outline: none;
/* Spacing between treeview and preview deck/search bar */
margin: 0px;
Expand All @@ -424,21 +421,21 @@ WSearchLineEdit {
}

/* triangle for closed/opened branches in treeview */
#LibraryContainer QTreeView::branch:has-children:!has-siblings:closed,
#LibraryContainer QTreeView::branch:closed:has-children:has-siblings {
WLibrarySidebar::branch:has-children:!has-siblings:closed,
WLibrarySidebar::branch:closed:has-children:has-siblings {
border-image: none; image: url(skin:/../Deere/image/style_branch_closed.png);
}

#LibraryContainer QTreeView::branch:open:has-children:!has-siblings,
#LibraryContainer QTreeView::branch:open:has-children:has-siblings {
WLibrarySidebar::branch:open:has-children:!has-siblings,
WLibrarySidebar::branch:open:has-children:has-siblings {
border-image: none; image: url(skin:/../Deere/image/style_branch_open.png);
}

/* space left of selected child item */
#LibraryContainer QTreeView::branch:!has-children:!has-siblings:closed:selected,
#LibraryContainer QTreeView::branch:closed:!has-children:has-siblings:selected,
#LibraryContainer QTreeView::branch:open:!has-children:!has-siblings:selected,
#LibraryContainer QTreeView::branch:open:!has-children:has-siblings:selected {
WLibrarySidebar::branch:!has-children:!has-siblings:closed:selected,
WLibrarySidebar::branch:closed:!has-children:has-siblings:selected,
WLibrarySidebar::branch:open:!has-children:!has-siblings:selected,
WLibrarySidebar::branch:open:!has-children:has-siblings:selected {
border-image: none;
background-color: #1F1F1F;
}
Expand Down Expand Up @@ -806,32 +803,37 @@ WBeatSpinBox,
WOverview #PassthroughLabel,
/* all context menus */
#MainMenu, #MainMenu QMenu,
WLibrarySidebar,
WLibrarySidebar QMenu,
WLibrary QHeaderView QMenu,
QTextBrowser QMenu,
WTrackTableViewHeader,
WTrackTableViewHeader QMenu,
WTrackTableViewHeader::section,
WLibraryTextBrowser,
WLibraryTextBrowser QMenu,
QLineEdit QMenu,
WCueMenuPopup,
WCueMenuPopup QLabel,
WCueMenuPopup QLineEdit,
WCoverArtMenu,
WTrackMenu,
WTrackMenu QMenu,
WTrackMenu QMenu QCheckBox,
WOverview /* Hotcue labels in the overview */,
WEffect,
WEffectSelector,
WEffectSelector QAbstractScrollArea,
#fadeModeCombobox,
#fadeModeCombobox QAbstractScrollArea
#LibraryContainer QPushButton,
#LibraryContainer QLabel,
#LibraryContainer QRadioButton,
#LibraryContainer QHeaderView,
#LibraryContainer QHeaderView::item {
#fadeModeCombobox QAbstractScrollArea,
WLibrary QPushButton,
WLibrary QLabel,
WLibrary QRadioButton {
font-family: "Open Sans";
font-style: normal;
font-weight: normal;
}

WWidget,
WLibrary QLabel,
WLibrary QPushButton {
WLabel, WLibrary QLabel,
WPushButton, WLibrary QPushButton {
font-size: 12px;
font-weight: bold;
text-transform: uppercase;
Expand Down Expand Up @@ -1568,8 +1570,6 @@ WPushButton {
border: 1px solid #4B4B4B;
border-radius: 2px;
outline: none;
font-size: 12px;
font-weight: bold;
}

WPushButton:hover,
Expand Down Expand Up @@ -1643,10 +1643,6 @@ WPushButton#PreviewIndicator[value="0"] {
border-radius: 3px;
}

WRecordingDuration {
font-weight: bold;
}

/* The effect unit mix mode button toggles between
two different modes that are not "on" or "off", so
do not highlight either state. */
Expand Down Expand Up @@ -1899,8 +1895,8 @@ do not highlight either state. */
QToolTip,
#MainMenu QMenu,
WLibrarySidebar QMenu,
WLibrary QHeaderView QMenu,
QTextBrowser QMenu,
WTrackTableViewHeader QMenu,
WLibraryTextBrowser QMenu,
WTrackMenu,
WTrackMenu QMenu,
QLineEdit QMenu,
Expand All @@ -1924,10 +1920,10 @@ QToolTip,
#ToolBar,
WLibrarySidebar QMenu,
WLibrarySidebar QMenu::item,
WLibrary QHeaderView QMenu,
WLibrary QHeaderView QMenu::item,
QTextBrowser QMenu,
QTextBrowser QMenu::item,
WTrackTableViewHeader QMenu,
WTrackTableViewHeader QMenu::item,
WLibraryTextBrowser QMenu,
WLibraryTextBrowser QMenu::item,
WTrackMenu,
WTrackMenu::item,
WTrackMenu QMenu,
Expand All @@ -1948,8 +1944,8 @@ WEffectSelector QAbstractScrollArea,
}
QToolTip,
WLibrarySidebar QMenu,
WLibrary QHeaderView QMenu,
QTextBrowser QMenu,
WTrackTableViewHeader QMenu,
WLibraryTextBrowser QMenu,
WTrackMenu,
WTrackMenu QMenu,
QLineEdit QMenu,
Expand All @@ -1971,9 +1967,9 @@ WEffectSelector QAbstractScrollArea,
#MainMenu QMenu::indicator:unchecked:selected,
WLibrarySidebar QMenu::item:selected,
WLibrarySidebar QMenu::indicator:unchecked:selected,
WLibrary QHeaderView QMenu::item:selected,
WLibrary QHeaderView QMenu::indicator:unchecked:selected,
QTextBrowser QMenu::item:selected,
WTrackTableViewHeader QMenu::item:selected,
WTrackTableViewHeader QMenu::indicator:unchecked:selected,
WLibraryTextBrowser QMenu::item:selected,
WTrackMenu::item:selected,
WTrackMenu QMenu::item:selected,
WTrackMenu QMenu QCheckBox:selected,
Expand Down Expand Up @@ -2130,7 +2126,7 @@ QLineEdit QMenu::separator {
}
#MainMenu QMenu::separator,
WLibrarySidebar QMenu::separator,
WLibrary QHeaderView QMenu::separator,
WTrackTableViewHeader QMenu::separator,
WTrackMenu::separator,
WTrackMenu QMenu::separator,
QLineEdit QMenu::separator {
Expand All @@ -2139,7 +2135,7 @@ QLineEdit QMenu::separator {

/* All menus that have at least one item with a checkbox*/
WLibrarySidebar QMenu::item,
WLibrary QHeaderView QMenu::item,
WTrackTableViewHeader QMenu::item,
#CratesMenu::item {
/* padding-right reserves space for the submenu expand arrow
padding-left should be bigger than the menu icon width +
Expand All @@ -2157,18 +2153,18 @@ WTrackMenu QMenu::item,
QLineEdit QMenu::item,
WCoverArtMenu::item,
/* for the sake of completeness: html root view of Crates, Rec etc. */
QTextBrowser QMenu::item {
WLibraryTextBrowser QMenu::item {
padding: 5px 12px 5px 12px;
}

/* Icons in those menus (copy, paste, cut, delete) */
QLineEdit QMenu::icon,
QTextBrowser QMenu::icon,
WLibraryTextBrowser QMenu::icon,
/* - checkbox in Crate name context menu
"[ ] Auto DJ Track Source" */
WLibrarySidebar QMenu::indicator,
/* Column checkboxes in the table header menu */
WLibrary QHeaderView QMenu::indicator {
WTrackTableViewHeader QMenu::indicator {
/* Qt 5.12.8: negative margin-right increases the overall item width but has no effect
on the indicator itself.
positive margin-right pushes icon to the right...
Expand All @@ -2183,7 +2179,7 @@ WTrackMenu QMenu QCheckBox {
}

WLibrarySidebar QMenu::indicator,
WLibrary QHeaderView QMenu::indicator,
WTrackTableViewHeader QMenu::indicator,
WTrackMenu QMenu QCheckBox::indicator {
width: 13px;
height: 13px;
Expand All @@ -2203,7 +2199,7 @@ WLibrary QTableView::indicator {

QLineEdit QMenu::icon:selected,
WLibrarySidebar QMenu::indicator:selected,
WLibrary QHeaderView QMenu::indicator:selected,
WTrackTableViewHeader QMenu::indicator:selected,
WTrackMenu QMenu QCheckBox::indicator:selected {
border: 1px solid #999;
}
Expand All @@ -2227,7 +2223,7 @@ WLibrary QTableView::indicator:checked,
WTrackMenu QMenu QCheckBox::indicator:checked {
image: url(skin:/../Deere/icon/ic_library_checkmark_orange.svg);
}
WLibrary QHeaderView QMenu::indicator:checked,
WTrackTableViewHeader QMenu::indicator:checked,
WEffectSelector::indicator:checked,
#fadeModeCombobox::indicator:checked {
image: url(skin:/../Deere/icon/ic_library_checkmark_blue.svg);
Expand Down Expand Up @@ -2263,8 +2259,8 @@ WTrackMenu QMenu::right-arrow {
selected, unchecked items would have a checkmark */
WLibrarySidebar QMenu::indicator:unchecked,
WLibrarySidebar QMenu::indicator:unchecked:selected,
WLibrary QHeaderView QMenu::indicator:unchecked,
WLibrary QHeaderView QMenu::indicator:unchecked:selected,
WTrackTableViewHeader QMenu::indicator:unchecked,
WTrackTableViewHeader QMenu::indicator:unchecked:selected,
WLibrary QTableView::indicator:unchecked,
WLibrary QTableView::indicator:unchecked:selected,
WEffectSelector::indicator:unchecked,
Expand Down
Loading

0 comments on commit 827c8c2

Please sign in to comment.