QDialog Focus Color

Adds focus color to QDialog button and tweaks.
This commit is contained in:
Kite 2017-09-13 21:33:50 +01:00
parent 807052a00f
commit de94b5772c
15 changed files with 94 additions and 73 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -5,11 +5,11 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg4489"
version="1.1"
viewBox="0 0 16 16"
width="100%"
height="100%"
width="100%">
viewBox="0 0 16 16"
version="1.1"
id="svg4489">
<defs
id="defs4483" />
<metadata
@ -25,10 +25,10 @@
</rdf:RDF>
</metadata>
<g
transform="translate(0,-1106.5197)"
id="layer1" />
id="layer1"
transform="translate(0,-1106.5197)" />
<path
id="path2"
style="clip-rule:evenodd;fill:#ffffff;fill-opacity:0.60784314;fill-rule:evenodd;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:1.41420996"
d="M 9.722125,7 H 4.277875 3.5 L 7,11 10.5,7 Z" />
d="M 9.722125,7 H 4.277875 3.5 L 7,11 10.5,7 Z"
style="clip-rule:evenodd;fill:#ffffff;fill-opacity:0.78431374;fill-rule:evenodd;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:1.41420996"
id="path2" />
</svg>

Before

Width:  |  Height:  |  Size: 1,010 B

After

Width:  |  Height:  |  Size: 1,010 B

View file

@ -5,32 +5,27 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg6"
style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"
xml:space="preserve"
version="1.1"
viewBox="0 0 11 11"
width="100%"
height="100%"
width="100%"><metadata
viewBox="0 0 11 11"
version="1.1"
xml:space="preserve"
style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"
id="svg6"><metadata
id="metadata12"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs10" /><circle
r="4.5"
cy="5.5"
cx="5.5"
style="fill:#000000;fill-opacity:0.4509804;stroke:none;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;paint-order:markers stroke fill"
id="path4484"
style="fill:#aeaeae;fill-opacity:0.43137255;stroke:none;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;paint-order:markers stroke fill" /><path
id="circle2"
cx="5.5"
cy="5.5"
r="4.5" /><path
style="clip-rule:evenodd;fill:#000000;fill-opacity:0.58943087;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"
d="M 5.4915254,0 A 5.5,5.5 0 0 0 -0.00847458,5.5 5.5,5.5 0 0 0 5.4915254,11 5.5,5.5 0 0 0 10.991526,5.5 5.5,5.5 0 0 0 5.4915254,0 Z m 0,1 a 4.5,4.5 0 0 1 4.5,4.5 4.5,4.5 0 0 1 -4.5,4.5 A 4.5,4.5 0 0 1 0.99152542,5.5 4.5,4.5 0 0 1 5.4915254,1 Z"
style="clip-rule:evenodd;fill:#aeaeae;fill-opacity:0.43137255;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5" /><circle
r="2.4957628"
cy="6.5042372"
cx="5.4957628"
id="path4497"
style="fill:#000000;fill-opacity:0.27642277;stroke:none;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" /><circle
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
id="circle2" /><circle
r="2.5"
cy="5.4999995"
cx="5.5"
id="circle4486"
cx="5.4957628"
cy="5.4957628"
r="2.4957628" /></svg>
style="fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" /></svg>

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View file

@ -5,22 +5,22 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg6"
style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"
xml:space="preserve"
version="1.1"
viewBox="0 0 11 11"
width="100%"
height="100%"
width="100%"><metadata
viewBox="0 0 11 11"
version="1.1"
xml:space="preserve"
style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"
id="svg6"><metadata
id="metadata12"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs10" /><circle
r="4.5"
cy="5.5"
cx="5.5"
style="fill:#000000;fill-opacity:0.4509804;stroke:none;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;paint-order:markers stroke fill"
id="path4483"
style="fill:#aeaeae;fill-opacity:0.43089432;stroke:none;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;paint-order:markers stroke fill" /><path
id="circle2"
cx="5.5"
cy="5.5"
r="4.5" /><path
style="fill:#000000;fill-opacity:0.58943087"
d="M 5.5 0 A 5.5 5.5 0 0 0 0 5.5 A 5.5 5.5 0 0 0 5.5 11 A 5.5 5.5 0 0 0 11 5.5 A 5.5 5.5 0 0 0 5.5 0 z M 5.5 1 A 4.5 4.5 0 0 1 10 5.5 A 4.5 4.5 0 0 1 5.5 10 A 4.5 4.5 0 0 1 1 5.5 A 4.5 4.5 0 0 1 5.5 1 z "
style="fill:#aeaeae;fill-opacity:0.43137255" /></svg>
id="circle2" /></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View file

@ -5,20 +5,20 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg4"
style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"
xml:space="preserve"
version="1.1"
viewBox="0 0 4 4"
width="100%"
height="100%"
width="100%"><metadata
viewBox="0 0 4 4"
version="1.1"
xml:space="preserve"
style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"
id="svg4"><metadata
id="metadata10"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs8" /><rect
id="rect2"
style="fill-opacity:0.39024389;fill:#000000"
height="4"
width="4"
x="0"
y="0"
x="0" /></svg>
width="4"
height="4"
style="fill-opacity:0.39024389;fill:#000000"
id="rect2" /></svg>

Before

Width:  |  Height:  |  Size: 887 B

After

Width:  |  Height:  |  Size: 887 B

View file

@ -29,7 +29,7 @@
@dock-placeholder-color: @selected-bg-color;
@window-border-color: @dock-bg-color;
@dialogButtonFrame-bg-color: darken(@bg, 6);
@dialogButtonFrame-bg-color: darken(@bg, 4);
@dialogButtonFrame-border-color: @accent;
@label-title: rgb(159, 218, 255);
@ -133,12 +133,17 @@
@button-border-color-pressed: @button-border-color;
@button-text-color-pressed: @button-text-color;
@button-bg-color-checked: @button-bg-color-pressed;
@button-bg-color-checked: darken(@button-bg-color-pressed, 0);
@button-border-color-checked: @button-border-color;
@button-text-color-checked: @button-text-color;
@button-bg-color-checked-hover: lighten(@button-bg-color-checked, 2);
@button-bg-color-checked-hover-pressed: @button-bg-color-pressed;
@button-bg-color-checked-hover-pressed: @button-bg-color-checked;
@button-bg-color-focus: @selected-bg-color;
@button-text-color-focus: @button-text-color-pressed;
@button-bg-color-focus-hover: lighten(@button-bg-color-focus, 8);
@button-bg-color-disabled: lighten(@bg, 5);
@button-border-color-disabled: @button-border-color;
@ -161,14 +166,14 @@
@toolbutton-border-color-checked: @toolbutton-bg-color-checked;
@toolbutton-text-color-checked: @text-color;
@toolbutton-bg-color-checked-hover: lighten(@toolbutton-bg-color-checked, 5);
@toolbutton-bg-color-checked-hover: lighten(@toolbutton-bg-color-checked, 15);
@toolbutton-border-color-checked-hover: @toolbutton-bg-color-checked-hover;
// Lock
@toolbutton-lock-bg-color-checked: #C34040;
@toolbutton-lock-border-color-checked: @toolbutton-lock-bg-color-checked;
@toolbutton-lock-bg-color-checked-hover: lighten(@toolbutton-lock-bg-color-checked, 5);
@toolbutton-lock-bg-color-checked-hover: lighten(@toolbutton-lock-bg-color-checked, 15);
@toolbutton-lock-border-color-checked-hover: @toolbutton-lock-bg-color-checked-hover;
// -----------------------------------------------------------------------------
@ -202,7 +207,7 @@
// Textfield
// -----------------------------------------------------------------------------
@input-bg-color: darken(@bg, 9);
@input-bg-color: darken(@bg, 10);
@input-border-color: darken(@input-bg-color, 0);
@input-text-color: @text-color;
@ -222,17 +227,17 @@
// CheckBox
// -----------------------------------------------------------------------------
@checkbox-bg-color: @button-bg-color;
@checkbox-border-color: @checkbox-bg-color;
@checkbox-bg-color: @input-bg-color;
@checkbox-border-color: @input-border-color;
@checkbox-bg-color-hover: @button-bg-color-hover;
@checkbox-border-color-hover: @checkbox-bg-color-hover;
@checkbox-bg-color-hover: @checkbox-bg-color;
@checkbox-border-color-hover: @selected-bg-color;
@checkbox-text-color-hover: @text-color;
@checkbox-bg-color-checked: @checkbox-bg-color;
@checkbox-border-color-checked: @checkbox-border-color;
@checkbox-bg-color-disabled: @button-bg-color-disabled;
@checkbox-bg-color-disabled: @input-bg-color-disabled;
@checkbox-border-color-disabled: @checkbox-bg-color-disabled;
// -----------------------------------------------------------------------------
@ -252,7 +257,7 @@
@slider-handle-border-color: @slider-handle-bg-color;
// DoublePairField, IntPairField
@slider-groove-color: darken(@bg, 14);
@slider-groove-color: darken(@bg, 11);
@slider-left-handle: @slider-handle-img;
@slider-right-handle: @slider-handle-img;
@slider-left-handle-disabled: @slider-handle-img-disabled;

View file

@ -17,6 +17,9 @@
background-color: @toolbutton-lock-bg-color-checked;
border-color: @toolbutton-lock-border-color-checked;
image: url('@{img-url}/cam_lock.svg');
&:hover {
background-color: @toolbutton-lock-bg-color-checked-hover;
}
}
}

View file

@ -24,6 +24,7 @@
color: @button-text-color;
padding: 3px 15px;
margin: @button-margin;
outline: 0;
&:hover {
background-color: @button-bg-color-hover;
border-color: @button-border-color-hover;

View file

@ -8,7 +8,16 @@ QDialog {
background-color: @dialogButtonFrame-bg-color;
border-top: 1px solid @dialogButtonFrame-border-color;
& QPushButton {
padding: 3px 15px;
&:focus {
background-color: @button-bg-color-focus;
color: @button-text-color-focus;
&:hover {
background-color: @button-bg-color-focus-hover;
}
&:pressed {
background-color: @button-bg-color-pressed;
}
}
}
}
}

View file

@ -41,6 +41,12 @@
// Frame
@scrollbar-bg-color: darken(@bg, 6);
// -----------------------------------------------------------------------------
// Textfield
// -----------------------------------------------------------------------------
@input-bg-color: darken(@bg, 8);
// -----------------------------------------------------------------------------
// Slider
// -----------------------------------------------------------------------------

View file

@ -12,7 +12,7 @@
@text-color: #101010;
@selected-bg-color: rgb(37, 80, 149);
@selected-text-color: rgba(255, 255, 255, 0.80);
@selected-text-color: #FFFFFF;
@selected-bg-color-secondary: lighten(@bg, 15);
@ -114,6 +114,9 @@
@button-border-color-checked: darken(@button-bg-color-checked, 5);
@button-text-color-checked: rgba(255, 255, 255, 0.80);
@button-bg-color-focus: lighten(@button-bg-color, 15);
@button-text-color-focus: @button-text-color-pressed;
@button-bg-color-disabled: lighten(@bg, 5);
@button-border-color-disabled: darken(@bg, 5);
@ -131,7 +134,7 @@
@input-border-color: darken(@bg, 18);
@input-text-color: @text-color;
@input-border-color-focus: #1C1C1C;
@input-bg-color-focus: #fff;
// -----------------------------------------------------------------------------
// CheckBox

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long