Add highlight for focused application icon

This commit is contained in:
jderose9
2017-02-15 22:34:50 -05:00
parent 451d569f33
commit 887bce8110
6 changed files with 642 additions and 4 deletions

View File

@@ -3,7 +3,7 @@
UUID = dash-to-panel@jderose9.github.com
BASE_MODULES = extension.js stylesheet.css metadata.json COPYING README.md
EXTRA_MODULES = convenience.js panel.js panelStyle.js overview.js taskbar.js secondaryMenu.js windowPreview.js prefs.js Settings.ui
#EXTRA_MEDIA = logo.svg
EXTRA_IMAGES = focused_multi_bg.svg focused_single_bg.svg focused_multi_running.svg unfocused_multi_running.svg
TOLOCALIZE = prefs.js
MSGSRC = $(wildcard po/*.po)
ifeq ($(strip $(DESTDIR)),)
@@ -69,8 +69,8 @@ _build: all
-rm -fR ./_build
mkdir -p _build
cp $(BASE_MODULES) $(EXTRA_MODULES) _build
#mkdir -p _build/media
#cd media ; cp $(EXTRA_MEDIA) ../_build/media/
mkdir -p _build/img
cd img ; cp $(EXTRA_IMAGES) ../_build/img/
mkdir -p _build/schemas
cp schemas/*.xml _build/schemas/
cp schemas/gschemas.compiled _build/schemas/

163
img/focused_multi_bg.svg Normal file
View File

@@ -0,0 +1,163 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
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"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="90.000000"
inkscape:export-xdpi="90.000000"
width="48"
height="1"
id="svg11300"
sodipodi:version="0.32"
inkscape:version="0.92.0 r"
sodipodi:docname="multi_focus.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
style="display:inline;enable-background:new">
<sodipodi:namedview
stroke="#ef2929"
fill="#f57900"
id="base"
pagecolor="#8c8c8c"
bordercolor="#ff5e00"
borderopacity="1"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:zoom="16"
inkscape:cx="24.320507"
inkscape:cy="-3.53125"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
inkscape:window-width="1920"
inkscape:window-height="907"
inkscape:window-x="0"
inkscape:window-y="0"
width="400px"
height="300px"
inkscape:snap-nodes="true"
inkscape:snap-bbox="true"
gridtolerance="10000"
inkscape:object-nodes="true"
inkscape:snap-grids="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-maximized="1"
inkscape:bbox-nodes="true"
inkscape:bbox-paths="false"
inkscape:snap-bbox-edge-midpoints="false"
inkscape:snap-bbox-midpoints="false"
objecttolerance="10000"
guidetolerance="10000"
borderlayer="true"
showborder="true"
guidecolor="#ff0b00"
guideopacity="1"
guidehicolor="#001aff"
guidehiopacity="0.49803922"
inkscape:snap-smooth-nodes="false"
inkscape:snap-page="true">
<inkscape:grid
type="xygrid"
id="grid3123"
empspacing="4"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
originx="0"
originy="0"
spacingx="1.0666667"
spacingy="1.0666667" />
</sodipodi:namedview>
<defs
id="defs3" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:creator>
<dc:source />
<cc:license
rdf:resource="" />
<dc:title></dc:title>
<dc:subject>
<rdf:Bag />
</dc:subject>
<dc:date />
<dc:rights>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:rights>
<dc:publisher>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:publisher>
<dc:identifier />
<dc:relation />
<dc:language />
<dc:coverage />
<dc:description />
<dc:contributor>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:contributor>
</cc:Work>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
style="display:inline"
inkscape:groupmode="layer"
inkscape:label="Base"
id="layer1"
transform="translate(0,-319)">
<rect
y="46"
x="319"
height="2"
width="0.99998581"
id="rect4270-9-7-3-3"
style="display:inline;opacity:0.15;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:0.49999651;enable-background:new"
transform="matrix(0,1,1,0,0,0)" />
<rect
y="45"
x="319"
height="1"
width="0.99998581"
id="rect4270-9-7-3-3-6"
style="display:inline;opacity:0.05;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:0.35355091;enable-background:new"
transform="matrix(0,1,1,0,0,0)" />
<rect
y="0"
x="319"
height="45"
width="0.99998581"
id="rect4270-9-7-3-3-6-3"
style="display:inline;opacity:0.25;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:2.3716917;enable-background:new"
transform="matrix(0,1,1,0,0,0)" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@@ -0,0 +1,155 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
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"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="90.000000"
inkscape:export-xdpi="90.000000"
width="48"
height="1"
id="svg11300"
sodipodi:version="0.32"
inkscape:version="0.92.0 r"
sodipodi:docname="multi_running.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
style="display:inline;enable-background:new">
<sodipodi:namedview
stroke="#ef2929"
fill="#f57900"
id="base"
pagecolor="#8c8c8c"
bordercolor="#ff5e00"
borderopacity="1"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:zoom="16"
inkscape:cx="20.81125"
inkscape:cy="-3.53125"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
inkscape:window-width="1920"
inkscape:window-height="907"
inkscape:window-x="0"
inkscape:window-y="0"
width="400px"
height="300px"
inkscape:snap-nodes="true"
inkscape:snap-bbox="true"
gridtolerance="10000"
inkscape:object-nodes="true"
inkscape:snap-grids="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-maximized="1"
inkscape:bbox-nodes="true"
inkscape:bbox-paths="false"
inkscape:snap-bbox-edge-midpoints="false"
inkscape:snap-bbox-midpoints="false"
objecttolerance="10000"
guidetolerance="10000"
borderlayer="true"
showborder="true"
guidecolor="#ff0b00"
guideopacity="1"
guidehicolor="#001aff"
guidehiopacity="0.49803922"
inkscape:snap-smooth-nodes="false"
inkscape:snap-page="true">
<inkscape:grid
type="xygrid"
id="grid3123"
empspacing="4"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
originx="0"
originy="0"
spacingx="1.0666667"
spacingy="1.0666667" />
</sodipodi:namedview>
<defs
id="defs3" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:creator>
<dc:source />
<cc:license
rdf:resource="" />
<dc:title></dc:title>
<dc:subject>
<rdf:Bag />
</dc:subject>
<dc:date />
<dc:rights>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:rights>
<dc:publisher>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:publisher>
<dc:identifier />
<dc:relation />
<dc:language />
<dc:coverage />
<dc:description />
<dc:contributor>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:contributor>
</cc:Work>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
style="display:inline"
inkscape:groupmode="layer"
inkscape:label="Base"
id="layer1"
transform="translate(0,-319)">
<rect
y="46"
x="319"
height="2"
width="0.99998581"
id="rect4270-9-7-3-3"
style="display:inline;opacity:0.7;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.49999651;enable-background:new"
transform="matrix(0,1,1,0,0,0)" />
<rect
y="45"
x="319"
height="1"
width="0.99998581"
id="rect4270-9-7-3-3-6"
style="display:inline;opacity:0.9;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.35355091;enable-background:new"
transform="matrix(0,1,1,0,0,0)" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.3 KiB

147
img/focused_single_bg.svg Normal file
View File

@@ -0,0 +1,147 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
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"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="90.000000"
inkscape:export-xdpi="90.000000"
width="1"
height="1"
id="svg11300"
sodipodi:version="0.32"
inkscape:version="0.92.0 r"
sodipodi:docname="focused_single_bg.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
style="display:inline;enable-background:new">
<sodipodi:namedview
stroke="#ef2929"
fill="#f57900"
id="base"
pagecolor="#8c8c8c"
bordercolor="#ff5e00"
borderopacity="1"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:zoom="16"
inkscape:cx="11.883007"
inkscape:cy="-3.78125"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
inkscape:window-width="1920"
inkscape:window-height="898"
inkscape:window-x="0"
inkscape:window-y="0"
width="400px"
height="300px"
inkscape:snap-nodes="true"
inkscape:snap-bbox="true"
gridtolerance="10000"
inkscape:object-nodes="true"
inkscape:snap-grids="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-maximized="1"
inkscape:bbox-nodes="true"
inkscape:bbox-paths="false"
inkscape:snap-bbox-edge-midpoints="false"
inkscape:snap-bbox-midpoints="false"
objecttolerance="10000"
guidetolerance="10000"
borderlayer="true"
showborder="true"
guidecolor="#ff0b00"
guideopacity="1"
guidehicolor="#001aff"
guidehiopacity="0.49803922"
inkscape:snap-smooth-nodes="false"
inkscape:snap-page="true">
<inkscape:grid
type="xygrid"
id="grid3123"
empspacing="4"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
originx="0"
originy="0"
spacingx="1.0666667"
spacingy="1.0666667" />
</sodipodi:namedview>
<defs
id="defs3" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:creator>
<dc:source />
<cc:license
rdf:resource="" />
<dc:title></dc:title>
<dc:subject>
<rdf:Bag />
</dc:subject>
<dc:date />
<dc:rights>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:rights>
<dc:publisher>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:publisher>
<dc:identifier />
<dc:relation />
<dc:language />
<dc:coverage />
<dc:description />
<dc:contributor>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:contributor>
</cc:Work>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
style="display:inline"
inkscape:groupmode="layer"
inkscape:label="Base"
id="layer1"
transform="translate(0,-319)">
<rect
y="0"
x="319"
height="1"
width="0.99998581"
id="rect4270-9-7-3-3-6-3"
style="display:inline;opacity:0.25;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:0.35355091;enable-background:new"
transform="matrix(0,1,1,0,0,0)" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@@ -0,0 +1,155 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
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"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="90.000000"
inkscape:export-xdpi="90.000000"
width="48"
height="1"
id="svg11300"
sodipodi:version="0.32"
inkscape:version="0.92.0 r"
sodipodi:docname="multi_running_unfocused.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
style="display:inline;enable-background:new">
<sodipodi:namedview
stroke="#ef2929"
fill="#f57900"
id="base"
pagecolor="#8c8c8c"
bordercolor="#ff5e00"
borderopacity="1"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:zoom="16"
inkscape:cx="10.24875"
inkscape:cy="-3.53125"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
inkscape:window-width="1920"
inkscape:window-height="898"
inkscape:window-x="0"
inkscape:window-y="0"
width="400px"
height="300px"
inkscape:snap-nodes="true"
inkscape:snap-bbox="true"
gridtolerance="10000"
inkscape:object-nodes="true"
inkscape:snap-grids="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-maximized="1"
inkscape:bbox-nodes="true"
inkscape:bbox-paths="false"
inkscape:snap-bbox-edge-midpoints="false"
inkscape:snap-bbox-midpoints="false"
objecttolerance="10000"
guidetolerance="10000"
borderlayer="true"
showborder="true"
guidecolor="#ff0b00"
guideopacity="1"
guidehicolor="#001aff"
guidehiopacity="0.49803922"
inkscape:snap-smooth-nodes="false"
inkscape:snap-page="true">
<inkscape:grid
type="xygrid"
id="grid3123"
empspacing="4"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
originx="0"
originy="0"
spacingx="1.0666667"
spacingy="1.0666667" />
</sodipodi:namedview>
<defs
id="defs3" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:creator>
<dc:source />
<cc:license
rdf:resource="" />
<dc:title />
<dc:subject>
<rdf:Bag />
</dc:subject>
<dc:date />
<dc:rights>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:rights>
<dc:publisher>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:publisher>
<dc:identifier />
<dc:relation />
<dc:language />
<dc:coverage />
<dc:description />
<dc:contributor>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:contributor>
</cc:Work>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
style="display:inline"
inkscape:groupmode="layer"
inkscape:label="Base"
id="layer1"
transform="translate(0,-319)">
<rect
y="42"
x="319"
height="6"
width="1"
id="rect4270-9-7-3-3"
style="display:inline;opacity:0.4;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.86602551;enable-background:new"
transform="matrix(0,1,1,0,0,0)" />
<rect
y="41"
x="319"
height="1"
width="1"
id="rect4270-9-7-3-3-6"
style="display:inline;opacity:0.9;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.35355341;enable-background:new"
transform="matrix(0,1,1,0,0,0)" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@@ -1404,9 +1404,25 @@ const taskbarAppIcon = new Lang.Class({
},
_onFocusAppChanged: function() {
if(this._nWindows > 1)
this._dot.set_style("background-image: url('" +
Me.path +
"/img/" +
(tracker.focus_app == this.app ? "focused" : "unfocused") +
"_multi_running.svg'); background-size: 48px 3px;");
else
this._dot.set_style("");
if(tracker.focus_app == this.app) {
this._dot.opacity = 255;
this.actor.add_style_class_name('focused');
this.actor.set_style("background-image: url('" +
Me.path +
"/img/focused_" +
(this._nWindows > 1 ? "multi" : "single") +
"_bg.svg'); background-position: 0 0; background-size: 48px 45px;");
Tweener.addTween(this._dot,
{ width: this._iconContainer.get_width(),
height: RUNNING_INDICATOR_SIZE,
@@ -1417,10 +1433,12 @@ const taskbarAppIcon = new Lang.Class({
{ opacity: 0,
time: DASH_ANIMATION_TIME,
transition: 'easeInOutCubic',
});
});
} else {
this._dot.opacity = 255;
this.actor.remove_style_class_name('focused');
this.actor.set_style("");
Tweener.addTween(this._dot,
{ width: 0,
height: RUNNING_INDICATOR_SIZE,