Skip to content

Commit

Permalink
Revert "Merge pull request mixxxdj#3902 from ronso0/skins-qss-icons"
Browse files Browse the repository at this point in the history
return to 'image: url(..) no-repeat center center;' for most skin icons
to avoid unscaled, blurry icons when Mixxx is scaled >100% with the 'background: ..'
shorthand at the cost of a lot of squeezed icons for (Linux) users still having
broken libKIconthemes5 5.80 installed.
A patched version of that lib is in the Mixxx 'stable' ppa.
  • Loading branch information
ronso0 committed Jun 1, 2021
1 parent f97ff5d commit 38d0e32
Show file tree
Hide file tree
Showing 20 changed files with 1,231 additions and 1,215 deletions.
4 changes: 2 additions & 2 deletions res/skins/Deere/sampler_text_row.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
<SetVariable name="state_0_pressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="state_0_unpressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="state_1_text"></SetVariable>
<SetVariable name="state_1_pressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="state_1_unpressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="state_1_pressed">icon/ic_pause_48px.svg</SetVariable>
<SetVariable name="state_1_unpressed">icon/ic_pause_48px.svg</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,cue_gotoandplay</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_default</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,play</SetVariable>
Expand Down
9 changes: 4 additions & 5 deletions res/skins/Deere/style.qss
Original file line number Diff line number Diff line change
Expand Up @@ -309,14 +309,13 @@ WLibrary QLineEdit,
QPushButton#LibraryPreviewButton {
background: transparent;
margin: 0px;
padding: 3px;
padding: 0px;
border: 1px solid transparent;
border-radius: 2px;
}

QPushButton#LibraryPreviewButton:!checked {
/* TODO ronso0 Restore once fixed lib linKIconThemes (vers. <..80) is in *ubuntu main repos */
/*image: url(skin:/../Deere/icon/ic_library_preview_play.svg);*/
image: url(skin:/../Deere/icon/ic_library_preview_play.svg);
}

QPushButton#LibraryPreviewButton:!checked:hover {
Expand All @@ -325,7 +324,7 @@ QPushButton#LibraryPreviewButton:!checked:hover {
}

QPushButton#LibraryPreviewButton:checked {
/*image: url(skin:/../Deere/icon/ic_library_preview_pause.svg);*/
image: url(skin:/../Deere/icon/ic_library_preview_pause.svg);
background-color: #0f0f0f;
border: 1px solid #006596;
}
Expand Down Expand Up @@ -1739,7 +1738,7 @@ do not highlight either state. */

/* Special case SamplerPlayButtonRepeating controls
When sampler is playing, displays same play icon as normal, but
background is red instead of blue.
background is purple instead of blue.
*/

#SamplerPlayButtonRepeating[value="1"] {
Expand Down
12 changes: 6 additions & 6 deletions res/skins/LateNight/palemoon/buttons/btn__lib_preview_pause.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions res/skins/LateNight/palemoon/buttons/btn__pfl.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion res/skins/LateNight/palemoon/buttons/btn__pfl_active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion res/skins/LateNight/skin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
<!-- ToDo ronso0 :: Unfortunately, variables are not considered here, yet ;)
because the launch screen appears while the skin is parsed.
image: url(skin:/style_<Variable name="scheme"/>/mixxx_logo.svg); -->
background: transparent url(skin:/palemoon/style/mixxx_logo.svg) no-repeat center center;
image: url(skin:/palemoon/style/mixxx_logo.svg);
padding: 0;
margin: 0px 2px 0px 2px;
border: none;
Expand Down
Loading

0 comments on commit 38d0e32

Please sign in to comment.