Skip to content

Commit

Permalink
LateNight: add searchbox styles
Browse files Browse the repository at this point in the history
  • Loading branch information
@ronso0
ronso0 committed Dec 18, 2021
1 parent 53a641c commit f1402ad
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 83 deletions.
3 changes: 1 addition & 2 deletions res/skins/LateNight/library.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<Template src="skin:/decks/preview_deck.xml"/>

<WidgetGroup><!--SearchBox + Library expand toggle -->
<ObjectName></ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>min,max</SizePolicy>
<Children>
Expand All @@ -56,7 +55,7 @@
<Template src="skin:/controls/button_2state.xml">
<SetVariable name="TooltipId">maximize_library</SetVariable>
<SetVariable name="ObjectName">LibExpand</SetVariable>
<SetVariable name="Size">16f,18me</SetVariable>
<SetVariable name="Size">18f,18me</SetVariable>
<SetVariable name="ConfigKey">[Master],maximize_library</SetVariable>
</Template>
</Children>
Expand Down
1 change: 0 additions & 1 deletion res/skins/LateNight/palemoon/buttons/btn__fx_selector_down.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 10 additions & 6 deletions res/skins/LateNight/style.qss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ WEffectChainPresetSelector QAbstractScrollArea {
}
WEffectSelector::down-arrow,
WEffectChainPresetSelector::down-arrow,
WSearchLineEdit::down-arrow,
#fadeModeCombobox::down-arrow,
WTrackTableView::indicator {
border: 0;
Expand All @@ -151,6 +152,10 @@ WEffectChainPresetSelector::checked,
WEffectChainPresetSelector::indicator,
WEffectChainPresetSelector::indicator:unchecked,
WEffectChainPresetSelector::drop-down,
WSearchLineEdit::checked,
WSearchLineEdit::indicator,
WSearchLineEdit::indicator:unchecked,
WSearchLineEdit::drop-down,
#fadeModeCombobox::checked,
#fadeModeCombobox::indicator,
#fadeModeCombobox::indicator:unchecked,
Expand All @@ -164,6 +169,7 @@ WEffectChainPresetSelector::drop-down,
/* Remove 3D border from unchecked effects checkmark space */
WEffectSelector::item:selected,
WEffectChainPresetSelector:item:selected,
WSearchLineEdit::item:selected,
#fadeModeCombobox::item:selected {
border: 0px;
}
Expand Down Expand Up @@ -301,7 +307,7 @@ WTrackTableViewHeader::item {
WTrackTableViewHeader::down-arrow {
width: 0.8em;
padding: 0 0.15em;
}
}


#HotcueButton {
Expand Down Expand Up @@ -629,13 +635,14 @@ WEffectChainPresetSelector {

WEffectSelector QAbstractScrollArea,
WEffectChainPresetSelector QAbstractScrollArea,
WSearchLineEdit QAbstractScrollArea,
#fadeModeCombobox QAbstractScrollArea {
border: 1px solid #444;
border-radius: 2px;
padding: 0px;
margin: 0px;
}
/* selected item */
/* checked item */
WEffectSelector:checked,
WEffectChainPresetSelector:checked,
#fadeModeCombobox:checked {
Expand All @@ -648,15 +655,12 @@ WEffectChainPresetSelector {
/* hovered items */
WEffectSelector::item:selected,
WEffectChainPresetSelector::item:selected,
WSearchLineEdit::item:selected,
#fadeModeCombobox::item:selected {
background-color: #333;
/* Already one of those properties destroys font config and
puts tick mark behind text:
margin: 0px;
padding: 0px; */
/* This moves the tick mark behind item text,
text sits at left border now
border: 0; */
}
WEffectSelector::indicator,
#fadeModeCombobox::indicator {
Expand Down
63 changes: 46 additions & 17 deletions res/skins/LateNight/style_classic.qss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ WLibrary {
#LibExpandBox {
border-width: 1px 0px 1px 0px;
border-radius: 0px;
padding: 0px 0px 2px 2px;
padding: 0px 0px 2px 4px;
}

#SidebarBox {
Expand Down Expand Up @@ -862,12 +862,15 @@ WEffectSelector,
}
WEffectSelector::down-arrow,
WEffectChainPresetSelector::down-arrow,
#fadeModeCombobox::down-arrow {
#fadeModeCombobox::down-arrow,
/* Arrow size is set in C++ to match the library font size */
WSearchLineEdit::down-arrow {
image: url(skin:/classic/buttons/btn__fx_selector_down.svg);
}
WEffectSelector::down-arrow:hover,
WEffectChainPresetSelector::down-arrow:hover,
#fadeModeCombobox::down-arrow:hover {
#fadeModeCombobox::down-arrow:hover,
WSearchLineEdit::down-arrow:hover {
image: url(skin:/classic/buttons/btn__fx_selector_down_pressed.svg);
}

Expand Down Expand Up @@ -1063,6 +1066,8 @@ WEffectSelector,
WEffectSelector QAbstractScrollArea,
WEffectChainPresetSelector,
WEffectChainPresetSelector QAbstractScrollArea,
WSearchLineEdit,
WSearchLineEdit QAbstractScrollArea,
#fadeModeCombobox,
#fadeModeCombobox QAbstractScrollArea {
font-family: "Open Sans";
Expand Down Expand Up @@ -1149,6 +1154,7 @@ WEffectSelector:!editable:on,
WEffectSelector QAbstractScrollArea,
WEffectChainPresetSelector,
WEffectChainPresetSelector QAbstractScrollArea,
WSearchLineEdit QAbstractScrollArea,
#fadeModeCombobox:!editable,
#fadeModeCombobox:!editable:on,
#fadeModeCombobox QAbstractScrollArea,
Expand Down Expand Up @@ -1931,6 +1937,7 @@ WPushButton#SamplerExpand[displayValue="0"],
margin: 0px 3px;
}

/* Search bar Clear button */
WSearchLineEdit QToolButton:!focus {
image: url(skin:/classic/buttons/btn__lib_clear_search.svg);
}
Expand Down Expand Up @@ -2173,7 +2180,8 @@ WTrackTableViewHeader {
/*********** scrollbars *********************************/
#LibraryContainer QScrollBar,
WEffectSelector QAbstractScrollArea QScrollBar,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar {
WEffectChainPresetSelector QAbstractScrollArea QScrollBar,
WSearchLineEdit QAbstractScrollArea QScrollBar {
border: 0px solid #585858;
background: #000;
border-radius: 2px;
Expand All @@ -2182,7 +2190,8 @@ WEffectChainPresetSelector QAbstractScrollArea QScrollBar {
}
#LibraryContainer QScrollBar:horizontal,
WEffectSelector QAbstractScrollArea QScrollBar:horizontal,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar:horizontal {
WEffectChainPresetSelector QAbstractScrollArea QScrollBar:horizontal,
WSearchLineEdit QAbstractScrollArea QScrollBar:horizontal {
min-width: 12px;
height: 15px;
border-top-left-radius: 0px;
Expand All @@ -2191,7 +2200,8 @@ WEffectChainPresetSelector QAbstractScrollArea QScrollBar {
}
#LibraryContainer QScrollBar:vertical,
WEffectSelector QAbstractScrollArea QScrollBar:vertical,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar:vertical {
WEffectChainPresetSelector QAbstractScrollArea QScrollBar:vertical,
WSearchLineEdit QAbstractScrollArea QScrollBar:vertical {
min-height: 12px;
width: 15px;
border-top-left-radius: 0px;
Expand All @@ -2204,7 +2214,8 @@ WEffectChainPresetSelector QAbstractScrollArea QScrollBar {
}*/
#LibraryContainer QScrollBar::handle:horizontal,
WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::handle:horizontal {
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::handle:horizontal,
WSearchLineEdit QAbstractScrollArea QScrollBar::handle:horizontal {
min-width: 25px;
border-radius: 2px;
background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
Expand All @@ -2213,7 +2224,8 @@ WEffectChainPresetSelector QAbstractScrollArea QScrollBar::handle:horizontal {
}
#LibraryContainer QScrollBar::handle:vertical,
WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::handle:vertical {
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::handle:vertical,
WSearchLineEdit QAbstractScrollArea QScrollBar::handle:vertical {
min-height: 25px;
border-radius: 2px;
background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
Expand All @@ -2227,7 +2239,9 @@ WEffectChainPresetSelector QAbstractScrollArea QScrollBar::handle:vertical {
WEffectSelector QAbstractScrollArea QScrollBar::add-page,
WEffectSelector QAbstractScrollArea QScrollBar::sub-page,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::add-page,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::sub-page {
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::sub-page,
WSearchLineEdit QAbstractScrollArea QScrollBar::add-page,
WSearchLineEdit QAbstractScrollArea QScrollBar::sub-page {
min-width: 15px;
min-height: 15px;
background-color: #000;
Expand All @@ -2239,7 +2253,9 @@ WEffectChainPresetSelector QAbstractScrollArea QScrollBar::sub-page {
WEffectSelector QAbstractScrollArea QScrollBar::add-line,
WEffectSelector QAbstractScrollArea QScrollBar::sub-line,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::add-line,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::sub-line {
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::sub-line,
WSearchLineEdit QAbstractScrollArea QScrollBar::add-line,
WSearchLineEdit QAbstractScrollArea QScrollBar::sub-line {
width: 0px;
height: 0px;
border: 0px;
Expand All @@ -2248,7 +2264,8 @@ WEffectChainPresetSelector QAbstractScrollArea QScrollBar::sub-line {
/* Corner in between two scrollbars */
#LibraryContainer QAbstractScrollArea::corner,
WEffectSelector QAbstractScrollArea QScrollBar::corner,
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::corner {
WEffectChainPresetSelector QAbstractScrollArea QScrollBar::corner,
WSearchLineEdit QAbstractScrollArea QScrollBar::corner {
background-color: #1e1e1e;
}
/*********** scrollbars *********************************/
Expand All @@ -2266,11 +2283,9 @@ WSearchLineEdit {
border: 2px solid #d08e00;
border-radius: 0px;
}
WSearchLineEdit[active="false"],
WSearchLineEdit:disabled {
color: #999;
}
WSearchLineEdit:disabled {
color: #191919;
/* hide '---' placeholder text */
background-color: #191919;
}
/* Clear button: see /skins/default.qss */
Expand Down Expand Up @@ -2384,6 +2399,7 @@ WCueMenuPopup,
WCoverArtMenu,
WEffectSelector QAbstractScrollArea,
WEffectChainPresetSelector QAbstractScrollArea,
WSearchLineEdit QAbstractScrollArea,
#fadeModeCombobox QAbstractScrollArea {
border: 1px solid #888;
border-radius: 2px;
Expand Down Expand Up @@ -2418,6 +2434,8 @@ WEffectSelector QAbstractScrollArea,
WEffectSelector::item,
WEffectChainPresetSelector QAbstractScrollArea,
WEffectChainPresetSelector::item,
WSearchLineEdit QAbstractScrollArea,
WSearchLineEdit::item,
#fadeModeCombobox QAbstractScrollArea,
#fadeModeCombobox::item {
background-color: #0f0f0f;
Expand Down Expand Up @@ -2446,6 +2464,7 @@ WCoverArtMenu::item:selected,
WEffectSelector::item:selected,
WEffectChainPresetSelector:item:selected,
#fadeModeCombobox::item:selected,
WSearchLineEdit::item:selected,
#SkinSettingsButton[hover="true"],
#SkinSettingsNumToggle[hover="true"],
#SkinSettingsNumToggleHeader[hover="true"],
Expand All @@ -2456,10 +2475,18 @@ WEffectChainPresetSelector:item:selected,
/* remove OS focus indicator */
outline: none;
}
/* checked item */
WEffectSelector::item:checked,
WEffectChainPresetSelector::item:checked,
#fadeModeCombobox::item:checked,
WSearchLineEdit::item:checked {
color: #fff;
}
/* hover over checked effect */
WEffectSelector::item:checked:selected,
WEffectChainPresetSelector::item:checked:selected,
#fadeModeCombobox::item:checked:selected {
#fadeModeCombobox::item:checked:selected,
WSearchLineEdit::item:checked:selected {
background-color: #2a1e03;
color: #fff;
}
Expand Down Expand Up @@ -2561,7 +2588,9 @@ WEffectSelector::indicator:unchecked:selected,
WEffectChainPresetSelector::indicator:unchecked,
WEffectChainPresetSelector::indicator:unchecked:selected,
#fadeModeCombobox::indicator:unchecked,
#fadeModeCombobox::indicator:unchecked:selected {
#fadeModeCombobox::indicator:unchecked:selected,
WSearchLineEdit::indicator:unchecked,
WSearchLineEdit::indicator:unchecked:selected {
image: none;
}
/************** common styles for WEffectSelector ******************************
Expand Down
Loading

0 comments on commit f1402ad

Please sign in to comment.