mirror of
https://github.com/morgan9e/dash-to-panel
synced 2026-04-14 00:04:17 +09:00
Add several indicator types and fix animation
This commit is contained in:
jderose9
2
Makefile
2
Makefile
@@ -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_IMAGES = focused_multi_bg.svg focused_single_bg.svg focused_multi_running.svg unfocused_multi_running.svg
|
||||
EXTRA_IMAGES = focused_multi_bg.svg focused_single_bg.svg
|
||||
TOLOCALIZE = prefs.js
|
||||
MSGSRC = $(wildcard po/*.po)
|
||||
ifeq ($(strip $(DESTDIR)),)
|
||||
|
||||
16
Settings.ui
16
Settings.ui
@@ -1348,8 +1348,13 @@
|
||||
<property name="halign">end</property>
|
||||
<property name="valign">center</property>
|
||||
<items>
|
||||
<item id="LINE" translatable="yes">Line</item>
|
||||
<item id="DOTS" translatable="yes">Dots</item>
|
||||
<item id="SQUARES" translatable="yes">Squares</item>
|
||||
<item id="DASHES" translatable="yes">Dashes</item>
|
||||
<item id="SEGMENTED" translatable="yes">Segmented</item>
|
||||
<item id="DOTTED" translatable="yes">Dotted</item>
|
||||
<item id="METRO" translatable="yes">Metro</item>
|
||||
<item id="SOLID" translatable="yes">Solid</item>
|
||||
</items>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -1404,8 +1409,13 @@
|
||||
<property name="halign">end</property>
|
||||
<property name="valign">center</property>
|
||||
<items>
|
||||
<item id="LINE" translatable="yes">Line</item>
|
||||
<item id="DOTS" translatable="yes">Dots</item>
|
||||
<item id="DOTS" translatable="yes">Dots</item>
|
||||
<item id="SQUARES" translatable="yes">Squares</item>
|
||||
<item id="DASHES" translatable="yes">Dashes</item>
|
||||
<item id="SEGMENTED" translatable="yes">Segmented</item>
|
||||
<item id="DOTTED" translatable="yes">Dotted</item>
|
||||
<item id="METRO" translatable="yes">Metro</item>
|
||||
<item id="SOLID" translatable="yes">Solid</item>
|
||||
</items>
|
||||
</object>
|
||||
<packing>
|
||||
|
||||
@@ -1,155 +0,0 @@
|
||||
<?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>
|
||||
|
Before Width: | Height: | Size: 4.3 KiB |
@@ -1,155 +0,0 @@
|
||||
<?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>
|
||||
|
Before Width: | Height: | Size: 4.3 KiB |
@@ -1,8 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<schemalist gettext-domain="gnome-shell-extensions">
|
||||
<enum id='org.gnome.shell.extensions.dash-to-panel.dotStyle'>
|
||||
<value value='0' nick='LINE'/>
|
||||
<value value='1' nick='DOTS'/>
|
||||
<value value='0' nick='DOTS'/>
|
||||
<value value='1' nick='SQUARES'/>
|
||||
<value value='2' nick='DASHES'/>
|
||||
<value value='3' nick='SEGMENTED'/>
|
||||
<value value='4' nick='DOTTED'/>
|
||||
<value value='5' nick='METRO'/>
|
||||
<value value='6' nick='SOLID'/>
|
||||
</enum>
|
||||
<enum id='org.gnome.shell.extensions.dash-to-panel.clickAction'>
|
||||
<value value='0' nick='SKIP'/>
|
||||
@@ -17,7 +22,7 @@
|
||||
<value value='1' nick='STATUSLEFT'/>
|
||||
<value value='2' nick='STATUSRIGHT'/>
|
||||
</enum>
|
||||
<enum id='org.gnome.shell.extensions.dash-to-panel.hotkeyPrefix'>
|
||||
<enum id='org.gnome.shell.extensions.dash-to-panel.hotkeyPrefix'>
|
||||
<value value='0' nick='Super'/>
|
||||
<value value='1' nick='SuperAlt'/>
|
||||
</enum>
|
||||
@@ -48,12 +53,12 @@
|
||||
<description>Running indicators are shown on the Bottom or Top of the screen.</description>
|
||||
</key>
|
||||
<key name="dot-style-focused" enum="org.gnome.shell.extensions.dash-to-panel.dotStyle">
|
||||
<default>'LINE'</default>
|
||||
<default>'METRO'</default>
|
||||
<summary>Style of the running indicator (focused)</summary>
|
||||
<description>Style of the running indicator for the icon for the currently focused application</description>
|
||||
</key>
|
||||
<key name="dot-style-unfocused" enum="org.gnome.shell.extensions.dash-to-panel.dotStyle">
|
||||
<default>'LINE'</default>
|
||||
<default>'DOTS'</default>
|
||||
<summary>Style of the running indicator (unfocused)</summary>
|
||||
<description>Style of the running indicator for the icon for applications which are not currently focused</description>
|
||||
</key>
|
||||
|
||||
233
taskbar.js
233
taskbar.js
@@ -58,7 +58,12 @@ let HFADE_WIDTH = 48;
|
||||
|
||||
let DOT_STYLE = {
|
||||
DOTS: "DOTS",
|
||||
LINE: "LINE"
|
||||
SQUARES: "SQUARES",
|
||||
DASHES: "DASHES",
|
||||
SEGMENTED: "SEGMENTED",
|
||||
DOTTED: "DOTTED",
|
||||
METRO: "METRO",
|
||||
SOLID: "SOLID"
|
||||
}
|
||||
|
||||
function getPosition() {
|
||||
@@ -1321,7 +1326,7 @@ const taskbarAppIcon = new Lang.Class({
|
||||
},
|
||||
|
||||
onWindowsChanged: function() {
|
||||
this._updateRunningStyle();
|
||||
this._updateCounterClass();
|
||||
this.updateIconGeometry();
|
||||
},
|
||||
|
||||
@@ -1354,16 +1359,16 @@ const taskbarAppIcon = new Lang.Class({
|
||||
return;
|
||||
}
|
||||
|
||||
this._focusedDots = new St.DrawingArea({y_expand: true});
|
||||
this._unfocusedDots = new St.DrawingArea({y_expand: true});
|
||||
this._focusedDots = new St.DrawingArea({width: 1 /* need to set some initial width so the area will be painted */, y_expand: true});
|
||||
this._unfocusedDots = new St.DrawingArea({width: 1 /* need to set some initial width so the area will be painted */, y_expand: true});
|
||||
|
||||
this._focusedDots.connect('repaint', Lang.bind(this, function() {
|
||||
this._drawRunningIndicator(this._focusedDots, this._dtpSettings.get_string('dot-style-focused'));
|
||||
this._drawRunningIndicator(this._focusedDots, this._dtpSettings.get_string('dot-style-focused'), true);
|
||||
this._onFocusAppChanged();
|
||||
}));
|
||||
|
||||
this._unfocusedDots.connect('repaint', Lang.bind(this, function() {
|
||||
this._drawRunningIndicator(this._unfocusedDots, this._dtpSettings.get_string('dot-style-unfocused'));
|
||||
this._drawRunningIndicator(this._unfocusedDots, this._dtpSettings.get_string('dot-style-unfocused'), false);
|
||||
this._onFocusAppChanged();
|
||||
}));
|
||||
|
||||
@@ -1372,8 +1377,6 @@ const taskbarAppIcon = new Lang.Class({
|
||||
this._iconContainer.add_child(this._unfocusedDots);
|
||||
|
||||
this._updateCounterClass();
|
||||
this._focusedDots.queue_repaint();
|
||||
this._unfocusedDots.queue_repaint();
|
||||
},
|
||||
|
||||
_settingsChangeRefresh: function() {
|
||||
@@ -1387,16 +1390,16 @@ const taskbarAppIcon = new Lang.Class({
|
||||
let margin = this._dtpSettings.get_int('appicon-margin');
|
||||
let inlineStyle = 'margin: 0 ' + margin + 'px;';
|
||||
|
||||
if(this._dtpSettings.get_boolean('focus-highlight') && tracker.focus_app == this.app && !this.isThemeProvidingIndicator()) {
|
||||
if(this._dtpSettings.get_boolean('focus-highlight') && tracker.focus_app == this.app && !this._isThemeProvidingIndicator()) {
|
||||
let containerWidth = this._iconContainer.get_width();
|
||||
inlineStyle += "background-image: url('" +
|
||||
Me.path + "/img/focused_" +
|
||||
((this._nWindows > 1 && this._dtpSettings.get_boolean('dot-stacked')) ? "multi" : "single") +
|
||||
"_bg.svg'); background-position: 0 " +
|
||||
((this._dtpSettings.get_string('dot-style-focused') == DOT_STYLE.LINE && this._dtpSettings.get_string('dot-position') == "TOP") ? this._dtpSettings.get_int('dot-size') : 0) +
|
||||
((this._isWideDotStyle(this._dtpSettings.get_string('dot-style-focused')) && this._dtpSettings.get_string('dot-position') == "TOP") ? this._dtpSettings.get_int('dot-size') : 0) +
|
||||
"px; background-size: " +
|
||||
containerWidth + "px " +
|
||||
(containerWidth - ((this._dtpSettings.get_string('dot-style-focused') == DOT_STYLE.LINE && this._dtpSettings.get_string('dot-position') == "BOTTOM") ? this._dtpSettings.get_int('dot-size') : 0)) + "px;"
|
||||
(containerWidth - ((this._isWideDotStyle(this._dtpSettings.get_string('dot-style-focused')) && this._dtpSettings.get_string('dot-position') == "BOTTOM") ? this._dtpSettings.get_int('dot-size') : this._dtpSettings.get_int('dot-size'))) + "px;"
|
||||
}
|
||||
|
||||
// graphical glitches if i dont set this on a timeout
|
||||
@@ -1404,20 +1407,6 @@ const taskbarAppIcon = new Lang.Class({
|
||||
Mainloop.timeout_add(0, Lang.bind(this, function() { this.actor.set_style(inlineStyle); }));
|
||||
},
|
||||
|
||||
_updateRunningStyle: function() {
|
||||
// When using workspace isolation, we need to hide the dots of apps with
|
||||
// no windows in the current workspace
|
||||
if (this._dtpSettings.get_boolean('isolate-workspaces')) {
|
||||
if (this.app.state != Shell.AppState.STOPPED
|
||||
&& getInterestingWindows(this.app, this._dtpSettings).length != 0)
|
||||
this._dot.show();
|
||||
else
|
||||
this._dot.hide();
|
||||
}
|
||||
|
||||
this._updateCounterClass();
|
||||
},
|
||||
|
||||
popupMenu: function() {
|
||||
this._removeMenuTimeout();
|
||||
this.actor.fake_release();
|
||||
@@ -1456,24 +1445,11 @@ const taskbarAppIcon = new Lang.Class({
|
||||
_onFocusAppChanged: function(force) {
|
||||
let containerWidth = this._iconContainer.get_width();
|
||||
let isFocused = (tracker.focus_app == this.app);
|
||||
let focusedDotStyle = this._dtpSettings.get_string('dot-style-focused');
|
||||
let unfocusedDotStyle = this._dtpSettings.get_string('dot-style-unfocused');
|
||||
let focusedIsWide = this._isWideDotStyle(focusedDotStyle);
|
||||
let unfocusedIsWide = this._isWideDotStyle(unfocusedDotStyle);
|
||||
|
||||
// let dotStyle = "";
|
||||
|
||||
// if(this._dtpSettings.get_boolean('dot-color-override'))
|
||||
// dotStyle += "background-color: " + this._dtpSettings.get_string('dot-color-' + (this._nWindows > 0 ? this._nWindows : 1)) + "; ";
|
||||
|
||||
// if(this._nWindows > 1 && this._dtpSettings.get_boolean('dot-stacked')&& !this.isThemeProvidingIndicator())
|
||||
// dotStyle += "background-image: url('" +
|
||||
// Me.path +
|
||||
// "/img/" +
|
||||
// (tracker.focus_app == this.app ? "focused" : "unfocused") +
|
||||
// "_multi_running.svg'); background-size: " +
|
||||
// containerWidth + "px " +
|
||||
// this._dtpSettings.get_int('dot-size') + "px;";
|
||||
|
||||
// this._dot.set_style(dotStyle.length ? dotStyle : null)
|
||||
|
||||
|
||||
this._setIconStyle();
|
||||
|
||||
let newFocusedDotsWidth = 0;
|
||||
@@ -1487,7 +1463,7 @@ const taskbarAppIcon = new Lang.Class({
|
||||
else
|
||||
this.actor.remove_style_class_name('focused');
|
||||
|
||||
if(this._dtpSettings.get_string('dot-style-focused') == DOT_STYLE.LINE) {
|
||||
if(focusedIsWide) {
|
||||
newFocusedDotsWidth = (isFocused && this._nWindows > 0) ? containerWidth : 0;
|
||||
newFocusedDotsOpacity = 255;
|
||||
} else {
|
||||
@@ -1495,7 +1471,7 @@ const taskbarAppIcon = new Lang.Class({
|
||||
newFocusedDotsOpacity = (isFocused && this._nWindows > 0) ? 255 : 0;
|
||||
}
|
||||
|
||||
if(this._dtpSettings.get_string('dot-style-unfocused') == DOT_STYLE.LINE) {
|
||||
if(focusedIsWide) {
|
||||
newUnfocusedDotsWidth = (!isFocused && this._nWindows > 0) ? containerWidth : 0;
|
||||
newUnfocusedDotsOpacity = 255;
|
||||
} else {
|
||||
@@ -1503,42 +1479,52 @@ const taskbarAppIcon = new Lang.Class({
|
||||
newUnfocusedDotsOpacity = (!isFocused && this._nWindows > 0) ? 255 : 0;
|
||||
}
|
||||
|
||||
// if(this._dtpSettings.get_boolean('animate-app-switch')) {
|
||||
|
||||
// this._focusedDots.opacity = newFocusedDotsOpacity;
|
||||
// if((this._focusedDots.get_width() != newFocusedDotsWidth && this._tweeningToWidth !== newFocusedDotsWidth) || force) {
|
||||
// this._tweeningToWidth = newFocusedDotsWidth;
|
||||
// Tweener.addTween(this._focusedDots,
|
||||
// { width: newFocusedDotsWidth,
|
||||
// opacity: newFocusedDotsOpacity,
|
||||
// time: DASH_ANIMATION_TIME,
|
||||
// transition: 'easeInOutCubic',
|
||||
// onComplete: Lang.bind(this, function() { this._tweeningToWidth = null })
|
||||
// });
|
||||
// }
|
||||
|
||||
// this._unfocusedDots.set_width(newUnfocusedDotsWidth);
|
||||
// if((this._unfocusedDots.get_opacity() != newUnfocusedDotsOpacity && this._tweeningToOpacity !== newUnfocusedDotsOpacity) || force) {
|
||||
// this._tweeningToOpacity = newUnfocusedDotsOpacity;
|
||||
|
||||
// Tweener.addTween(this._unfocusedDots,
|
||||
// { width: newUnfocusedDotsWidth,
|
||||
// opacity: newUnfocusedDotsOpacity,
|
||||
// time: DASH_ANIMATION_TIME,
|
||||
// transition: 'easeInOutCubic',
|
||||
// onComplete: Lang.bind(this, function() { this._tweeningToOpacity = null })
|
||||
// });
|
||||
// }
|
||||
// } else {
|
||||
// Only animate if...
|
||||
// animation is enabled in settings
|
||||
// AND (going from a wide style to a narrow style indicator or vice-versa
|
||||
// OR going from an open app to a closed app or vice versa)
|
||||
if(this._dtpSettings.get_boolean('animate-app-switch') && (
|
||||
focusedIsWide != unfocusedIsWide ||
|
||||
(focusedIsWide && (this._focusedDots.width != newUnfocusedDotsWidth || this._unfocusedDots.width != newFocusedDotsWidth)) ||
|
||||
(!focusedIsWide && (this._focusedDots.opacity != newUnfocusedDotsOpacity || this._unfocusedDots.opacity != newFocusedDotsOpacity))
|
||||
)) {
|
||||
this._animateDotDisplay(this._focusedDots, newFocusedDotsWidth, newFocusedDotsOpacity);
|
||||
this._animateDotDisplay(this._unfocusedDots, newUnfocusedDotsWidth, newUnfocusedDotsOpacity);
|
||||
} else {
|
||||
this._focusedDots.opacity = newFocusedDotsOpacity;
|
||||
this._unfocusedDots.opacity = newUnfocusedDotsOpacity;
|
||||
this._focusedDots.width = newFocusedDotsWidth;
|
||||
this._unfocusedDots.width = newUnfocusedDotsWidth;
|
||||
// }
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
isThemeProvidingIndicator: function () {
|
||||
_animateDotDisplay: function (dots, newWidth, newOpacity, force) {
|
||||
if( (dots.width != newWidth && dots._tweeningToWidth !== newWidth) ||
|
||||
(dots.opacity != newOpacity && dots._tweeningToOpacity !== newOpacity) ||
|
||||
force) {
|
||||
dots._tweeningToWidth = newWidth;
|
||||
dots._tweeningToOpacity = newOpacity;
|
||||
Tweener.addTween(dots,
|
||||
{ width: newWidth,
|
||||
opacity: newOpacity,
|
||||
time: DASH_ANIMATION_TIME,
|
||||
transition: 'easeInOutCubic',
|
||||
onComplete: Lang.bind(this, function() {
|
||||
dots._tweeningToWidth = null;
|
||||
dots._tweeningToOpacity = null;
|
||||
})
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
_isWideDotStyle: function(dotStyle) {
|
||||
return dotStyle == DOT_STYLE.SEGMENTED ||
|
||||
dotStyle == DOT_STYLE.DOTTED ||
|
||||
dotStyle == DOT_STYLE.METRO ||
|
||||
dotStyle == DOT_STYLE.SOLID;
|
||||
},
|
||||
|
||||
_isThemeProvidingIndicator: function () {
|
||||
// This is an attempt to determine if the theme is providing their shown
|
||||
// running indicator by way of a border image on the icon, for example in
|
||||
// the theme Ciliora
|
||||
@@ -1661,12 +1647,6 @@ const taskbarAppIcon = new Lang.Class({
|
||||
},
|
||||
|
||||
_updateCounterClass: function() {
|
||||
|
||||
if(this._dtpSettings.get_string('dot-position') == "TOP")
|
||||
this._dot.set_y_align(Clutter.ActorAlign.START);
|
||||
else
|
||||
this._dot.set_y_align(Clutter.ActorAlign.END);
|
||||
|
||||
let maxN = 4;
|
||||
this._nWindows = Math.min(getInterestingWindows(this.app, this._dtpSettings).length, maxN);
|
||||
|
||||
@@ -1679,7 +1659,7 @@ const taskbarAppIcon = new Lang.Class({
|
||||
}
|
||||
},
|
||||
|
||||
_drawRunningIndicator: function(area, type) {
|
||||
_drawRunningIndicator: function(area, type, isFocused) {
|
||||
let bodyColor;
|
||||
if(this._dtpSettings.get_boolean('dot-color-override')) {
|
||||
bodyColor = Clutter.color_from_string(this._dtpSettings.get_string('dot-color-' + (this._nWindows > 0 ? this._nWindows : 1)))[1];
|
||||
@@ -1696,25 +1676,106 @@ const taskbarAppIcon = new Lang.Class({
|
||||
let size = this._dtpSettings.get_int('dot-size');
|
||||
let padding = 0; // distance from the margin
|
||||
let yOffset = this._dtpSettings.get_string('dot-position') == "TOP" ? 0 : (height - padding - size);
|
||||
Clutter.cairo_set_source_color(cr, bodyColor);
|
||||
|
||||
if(type == DOT_STYLE.DOTS) {
|
||||
// Draw the required numbers of dots
|
||||
let radius = this._dtpSettings.get_int('dot-size')/2;
|
||||
let spacing = width/22; // separation between the dots
|
||||
let radius = size/2;
|
||||
let spacing = width/18; // separation between the dots
|
||||
|
||||
cr.translate((width - (2*n)*radius - (n-1)*spacing)/2, yOffset);
|
||||
|
||||
Clutter.cairo_set_source_color(cr, bodyColor);
|
||||
for (let i = 0; i < n; i++) {
|
||||
cr.newSubPath();
|
||||
cr.arc((2*i+1)*radius + i*spacing, radius, radius, 0, 2*Math.PI);
|
||||
}
|
||||
} else {
|
||||
cr.fill();
|
||||
} else if(type == DOT_STYLE.SQUARES) {
|
||||
let spacing = width/18; // separation between the dots
|
||||
|
||||
cr.translate((width - n*size - (n-1)*spacing)/2, yOffset);
|
||||
|
||||
Clutter.cairo_set_source_color(cr, bodyColor);
|
||||
for (let i = 0; i < n; i++) {
|
||||
cr.newSubPath();
|
||||
cr.rectangle(i*size + i*spacing, 0, size, size);
|
||||
}
|
||||
cr.fill();
|
||||
} else if(type == DOT_STYLE.DASHES) {
|
||||
let spacing = width/16; // separation between the dots
|
||||
let dashLength = size*3;
|
||||
|
||||
cr.translate((width - n*dashLength - (n-1)*spacing)/2, yOffset);
|
||||
|
||||
Clutter.cairo_set_source_color(cr, bodyColor);
|
||||
for (let i = 0; i < n; i++) {
|
||||
cr.newSubPath();
|
||||
cr.rectangle(i*dashLength + i*spacing, 0, dashLength, size);
|
||||
}
|
||||
cr.fill();
|
||||
} else if(type == DOT_STYLE.SEGMENTED) {
|
||||
let spacing = width/18; // separation between the dots
|
||||
let dashLength = (width - ((n-1)*spacing))/n;
|
||||
|
||||
cr.translate(0, yOffset);
|
||||
|
||||
Clutter.cairo_set_source_color(cr, bodyColor);
|
||||
for (let i = 0; i < n; i++) {
|
||||
cr.newSubPath();
|
||||
cr.rectangle(i*dashLength + i*spacing, 0, dashLength, size);
|
||||
}
|
||||
cr.fill();
|
||||
} else if (type == DOT_STYLE.DOTTED) {
|
||||
let spacing = size; // separation between the dots
|
||||
let lineLength = width - (size*(n-1)) - (spacing*(n-1));
|
||||
|
||||
cr.translate(0, yOffset);
|
||||
|
||||
Clutter.cairo_set_source_color(cr, bodyColor);
|
||||
cr.newSubPath();
|
||||
cr.rectangle(0, 0, lineLength, size);
|
||||
for (let i = 1; i < n; i++) {
|
||||
cr.newSubPath();
|
||||
cr.rectangle(lineLength + (i*spacing) + ((i-1)*size), 0, size, size);
|
||||
}
|
||||
cr.fill();
|
||||
} else if (type == DOT_STYLE.METRO) {
|
||||
if(n <= 1) {
|
||||
cr.translate(0, yOffset);
|
||||
Clutter.cairo_set_source_color(cr, bodyColor);
|
||||
cr.newSubPath();
|
||||
cr.rectangle(0, 0, width, size);
|
||||
cr.fill();
|
||||
} else {
|
||||
let blackenedLength = (1/48)*width; // need to scale with the SVG for the stacked highlight
|
||||
let darkenedLength = isFocused ? (2/48)*width : (10/48)*width;
|
||||
let blackenedColor = bodyColor.shade(.3);
|
||||
blackenedColor = new Clutter.Color({ red: blackenedColor.red, green: blackenedColor.green, blue: blackenedColor.blue, alpha: 100});
|
||||
let darkenedColor = bodyColor.shade(.7);
|
||||
|
||||
cr.translate(0, yOffset);
|
||||
|
||||
Clutter.cairo_set_source_color(cr, bodyColor);
|
||||
cr.newSubPath();
|
||||
cr.rectangle(0, 0, width - darkenedLength - blackenedLength, size);
|
||||
cr.fill();
|
||||
Clutter.cairo_set_source_color(cr, blackenedColor);
|
||||
cr.newSubPath();
|
||||
cr.rectangle(width - darkenedLength - blackenedLength, 0, 1, size);
|
||||
cr.fill();
|
||||
Clutter.cairo_set_source_color(cr, darkenedColor);
|
||||
cr.newSubPath();
|
||||
cr.rectangle(width - darkenedLength, 0, darkenedLength, size);
|
||||
cr.fill();
|
||||
}
|
||||
} else { // solid
|
||||
cr.translate(0, yOffset);
|
||||
Clutter.cairo_set_source_color(cr, bodyColor);
|
||||
cr.newSubPath();
|
||||
cr.rectangle(0, 0, width, size);
|
||||
cr.fill();
|
||||
}
|
||||
|
||||
cr.fill();
|
||||
cr.$dispose();
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user