Skip to content

Fx selector: fix cut-off effect names in drop-down list for Linux #1596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ronso0 wants to merge 5 commits into from
Closed

Fx selector: fix cut-off effect names in drop-down list for Linux #1596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61caa65
Deere: fix effect list cut-off for Linux
Apr 10, 2018
1650c6a
LateNight: fix effect list cut-off for Linux
Apr 10, 2018
4287d43
Shade: fix effect list cut-off for Linux
Apr 10, 2018
189e924
Tango: bring back tick mark to effect selector list
Apr 10, 2018
8b0ccd5
Shade: correct comments in style-linux.qss
Apr 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion res/skins/Deere/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</manifest>

<ObjectName>Mixxx</ObjectName>
<Style src="skin:style.qss" src-mac="skin:style-mac.qss"/>
<Style src="skin:style.qss" src-linux="skin:style-linux.qss" src-mac="skin:style-mac.qss"/>

<Size>1008me,550me</Size>
<Layout>horizontal</Layout>
Expand Down
26 changes: 26 additions & 0 deletions res/skins/Deere/style-linux.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
Deere , Skin for Mixxx 2.1.xx
www.mixxx.org
Copyright (C) 2010-2015 RJ Ryan <rryan@mixxx.org>, S.Brandt <s.brandt@mixxx.org>
This file is part of the "Deere" Skin for Mixxx
"Deere" is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported license.
http://creativecommons.org/licenses/by-sa/3.0/

Mixxx skin documentation:
http://mixxx.org/wiki/doku.php/creating_skins

List of controls:
http://mixxx.org/wiki/doku.php/mixxxcontrols

Qt Style Sheets documentation:
http://doc.qt.io/qt-4.8/stylesheet-examples.html

This file only contains a hack to prevent effect names in effect selector list being cut off.

*/

WEffectSelector QAbstractItemView {
color: #c1cabe;
background-color: #201f1f;
padding: 0px 0px 0px -5px;
}
2 changes: 1 addition & 1 deletion res/skins/LateNight/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</manifest>

<ObjectName>Mixxx</ObjectName>
<Style src="skin:style.qss" src-mac="skin:style-mac.qss"/>
<Style src="skin:style.qss" src-linux="skin:style-linux.qss" src-mac="skin:style-mac.qss"/>

<!-- MinimumSize should not be an exact monitor resolution. There needs
to be space for the title bar or other chrome at full screen -->
Expand Down
15 changes: 15 additions & 0 deletions res/skins/LateNight/style-linux.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* LateNight 2.1
* hack to prevent effect names in effect selector list being cut off */

WEffectSelector QAbstractItemView {
width: 142px;
background-color: #0f0f0f;
/* padding-left: 6px; */
font-size: 12px/13px;
/* On Linux, this is not applied but font color from WEffectSelector
is inherited. For Windows, it must be defined here */
color: #cfb32c;
border: 1px solid #666;
border-radius: 2px;
padding: 0px 0px 0px -10px;
}
2 changes: 1 addition & 1 deletion res/skins/Shade/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
-->

<ObjectName>Mixxx</ObjectName>
<Style src="skin:style.qss" src-mac="skin:style-mac.qss"/>
<Style src="skin:style.qss" src-linux="skin:style-linux.qss" src-mac="skin:style-mac.qss"/>
<Size>1008e,500e</Size>
<Layout>vertical</Layout>
<LaunchImageStyle>
Expand Down
11 changes: 11 additions & 0 deletions res/skins/Shade/style-linux.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/* Shade 2.1
* This file only contains a hack to prevent effect names in effect selector list being cut off. */
WEffectSelector QAbstractItemView {
margin: 0px 0px 0px -30px;
}

/* just in case there is a partial checkmark shown on some untested screen, hide
the checkmark */
WEffectSelector::indicator {
border: 0;
}
8 changes: 4 additions & 4 deletions res/skins/Tango/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1548,8 +1548,8 @@ decks, samplers, mic, aux, fx */
/* tick mark frame */
WEffectSelector::indicator:checked {
/* This is sufficient to completely hide the tick mark,
but this alone would show an empty, shadowed box instead of tick mark: */
background-color: transparent;
but this alone would show an empty, shadowed box instead of tick mark:
background-color: transparent; */
/* This should decrease the tick mark's left & right margin but is not respected
margin: 0px -4px 0px -4px; */
/* This draws a border. And eliminates the tick mark...
Expand All @@ -1560,8 +1560,8 @@ decks, samplers, mic, aux, fx */
/* Image is rendered correctly but size of the tick mark containers
won't change. Also, only with this option the hover bg color defined
above will be applied... it's qt magic
image: url(skin:/buttons/btn_fx_selector_tick.svg) no-repeat center center; */
background: #0081B7;
image: url(skin:/buttons/btn_fx_selector_tick.svg) no-repeat center center;
background: #0081B7; */
}
Copy link
Copy Markdown
Member Author

@ronso0 ronso0 Apr 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll keep all those comments. Helpful, also it took quite a while to gather those infos..


#FxParametersLeft {
Expand Down