diff --git a/Settings.ui b/Settings.ui index 4cfd151..cbbad32 100644 --- a/Settings.ui +++ b/Settings.ui @@ -1242,6 +1242,49 @@ + + + True + True + + + True + False + 12 + 12 + 12 + 12 + 32 + + + True + False + True + Font color of the minimized application titles + True + 0 + + + 0 + 0 + + + + + True + True + True + end + + + 1 + 0 + + + + + + True diff --git a/appIcons.js b/appIcons.js index 56b8a7d..bfc9bda 100644 --- a/appIcons.js +++ b/appIcons.js @@ -208,9 +208,13 @@ var taskbarAppIcon = Utils.defineClass({ } this._titleWindowChangeId = 0; + this._minimizedWindowChangeId = 0; } else { this._titleWindowChangeId = this.window.connect('notify::title', Lang.bind(this, this._updateWindowTitle)); + + this._minimizedWindowChangeId = this.window.connect('notify::minimized', + Lang.bind(this, this._updateWindowTitleStyle)); } this._scrollEventId = this.actor.connect('scroll-event', this._onMouseScroll.bind(this)); @@ -246,6 +250,7 @@ var taskbarAppIcon = Utils.defineClass({ Me.settings.connect('changed::group-apps-label-font-size', Lang.bind(this, this._updateWindowTitleStyle)), Me.settings.connect('changed::group-apps-label-font-weight', Lang.bind(this, this._updateWindowTitleStyle)), Me.settings.connect('changed::group-apps-label-font-color', Lang.bind(this, this._updateWindowTitleStyle)), + Me.settings.connect('changed::group-apps-label-font-color-minimized', Lang.bind(this, this._updateWindowTitleStyle)), Me.settings.connect('changed::group-apps-label-max-width', Lang.bind(this, this._updateWindowTitleStyle)), Me.settings.connect('changed::group-apps-use-fixed-width', Lang.bind(this, this._updateWindowTitleStyle)), Me.settings.connect('changed::group-apps-underline-unfocused', Lang.bind(this, this._settingsChangeRefresh)) @@ -307,6 +312,9 @@ var taskbarAppIcon = Utils.defineClass({ if(this._titleWindowChangeId) this.window.disconnect(this._titleWindowChangeId); + if(this._minimizedWindowChangeId) + this.window.disconnect(this._minimizedWindowChangeId); + if (this._windowEnteredMonitorId) { Utils.DisplayWrapper.getScreen().disconnect(this._windowEnteredMonitorId); Utils.DisplayWrapper.getScreen().disconnect(this._windowLeftMonitorId); @@ -476,6 +484,9 @@ var taskbarAppIcon = Utils.defineClass({ let useFixedWidth = Me.settings.get_boolean('group-apps-use-fixed-width'); let variableWidth = !useFixedWidth || Panel.checkIfVertical() || this.dtpPanel.taskbar.fullScrollView; let fontWeight = Me.settings.get_string('group-apps-label-font-weight'); + let fontColor = this.window.minimized ? + Me.settings.get_string('group-apps-label-font-color-minimized') : + Me.settings.get_string('group-apps-label-font-color'); let scaleFactor = Utils.getScaleFactor(); let maxLabelWidth = Me.settings.get_int('group-apps-label-max-width') * scaleFactor; @@ -488,7 +499,7 @@ var taskbarAppIcon = Utils.defineClass({ this._windowTitle.set_style('font-size: ' + Me.settings.get_int('group-apps-label-font-size') + 'px;' + 'font-weight: ' + fontWeight + ';' + (useFixedWidth ? '' : 'max-width: ' + maxLabelWidth + 'px;') + - 'color: ' + Me.settings.get_string('group-apps-label-font-color')); + 'color: ' + fontColor); } }, diff --git a/media/sources/D2P_import settings/Artist_design b/media/sources/D2P_import settings/Artist_design index 3390515..edd39b7 100644 --- a/media/sources/D2P_import settings/Artist_design +++ b/media/sources/D2P_import settings/Artist_design @@ -29,6 +29,7 @@ trans-gradient-top-opacity=1.0 leftbox-size=0 show-showdesktop-button=true group-apps-label-font-color='#ffffff' +group-apps-label-font-color-minimized='#ffffff' intellihide-behaviour='FOCUSED_WINDOWS' show-favorites=true group-apps=true diff --git a/media/sources/D2P_import settings/Fortnite_Brite gunner b/media/sources/D2P_import settings/Fortnite_Brite gunner index 74a20b7..da54ec9 100644 --- a/media/sources/D2P_import settings/Fortnite_Brite gunner +++ b/media/sources/D2P_import settings/Fortnite_Brite gunner @@ -29,6 +29,7 @@ trans-gradient-top-opacity=0.0 leftbox-size=0 show-showdesktop-button=true group-apps-label-font-color='#ffffff' +group-apps-label-font-color-minimized='#ffffff' intellihide-behaviour='FOCUSED_WINDOWS' show-favorites=true group-apps=true diff --git a/media/sources/D2P_import settings/Galaxy_bizouneur b/media/sources/D2P_import settings/Galaxy_bizouneur index 61385c2..b4576a5 100644 --- a/media/sources/D2P_import settings/Galaxy_bizouneur +++ b/media/sources/D2P_import settings/Galaxy_bizouneur @@ -29,6 +29,7 @@ trans-gradient-top-opacity=0.0 leftbox-size=0 show-showdesktop-button=true group-apps-label-font-color='#ffffff' +group-apps-label-font-color-minimized='#ffffff' intellihide-behaviour='FOCUSED_WINDOWS' show-favorites=true group-apps=true diff --git a/media/sources/D2P_import settings/Ghibli_student b/media/sources/D2P_import settings/Ghibli_student index 6f38506..edc1809 100644 --- a/media/sources/D2P_import settings/Ghibli_student +++ b/media/sources/D2P_import settings/Ghibli_student @@ -29,6 +29,7 @@ trans-gradient-top-opacity=0.0 leftbox-size=0 show-showdesktop-button=false group-apps-label-font-color='#ffffff' +group-apps-label-font-color-minimized='#ffffff' intellihide-behaviour='FOCUSED_WINDOWS' show-favorites=true group-apps=false diff --git a/media/sources/D2P_import settings/Mountain_intellihide b/media/sources/D2P_import settings/Mountain_intellihide index de05575..7af0543 100644 --- a/media/sources/D2P_import settings/Mountain_intellihide +++ b/media/sources/D2P_import settings/Mountain_intellihide @@ -1,5 +1,6 @@ [/] group-apps-label-font-color='#dddddd' +group-apps-label-font-color-minimized='#dddddd' tray-padding=-1 trans-min-panel-opacity=0.32000000000000001 enter-peek-mode-timeout=500 diff --git a/media/sources/D2P_import settings/Plants_Solitaire b/media/sources/D2P_import settings/Plants_Solitaire index 7b6aae4..dc85636 100644 --- a/media/sources/D2P_import settings/Plants_Solitaire +++ b/media/sources/D2P_import settings/Plants_Solitaire @@ -29,6 +29,7 @@ trans-gradient-top-opacity=0.0 leftbox-size=0 show-showdesktop-button=true group-apps-label-font-color='#ffffff' +group-apps-label-font-color-minimized='#ffffff' intellihide-behaviour='FOCUSED_WINDOWS' show-favorites=true group-apps=true diff --git a/media/sources/D2P_import settings/Star Wars_gamer b/media/sources/D2P_import settings/Star Wars_gamer index 74d2577..9b06201 100644 --- a/media/sources/D2P_import settings/Star Wars_gamer +++ b/media/sources/D2P_import settings/Star Wars_gamer @@ -29,6 +29,7 @@ trans-gradient-top-opacity=0.90000000000000002 leftbox-size=0 show-showdesktop-button=true group-apps-label-font-color='#ffffff' +group-apps-label-font-color-minimized='#ffffff' intellihide-behaviour='FOCUSED_WINDOWS' show-favorites=true group-apps=true diff --git a/media/sources/D2P_import settings/Wolf_programmer b/media/sources/D2P_import settings/Wolf_programmer index 167b75a..e040070 100644 --- a/media/sources/D2P_import settings/Wolf_programmer +++ b/media/sources/D2P_import settings/Wolf_programmer @@ -1,5 +1,6 @@ [/] group-apps-label-font-color='#dddddd' +group-apps-label-font-color-minimized='#dddddd' tray-padding=-1 trans-min-panel-opacity=0.32000000000000001 enter-peek-mode-timeout=500 diff --git a/prefs.js b/prefs.js index 7dc75e0..5206154 100644 --- a/prefs.js +++ b/prefs.js @@ -1338,6 +1338,13 @@ const Settings = new Lang.Class({ this._settings.set_string('group-apps-label-font-color', hexString); })); + this._builder.get_object('group_apps_label_font_color_minimized_colorbutton').connect('notify::color', Lang.bind(this, function (button) { + let rgba = button.get_rgba(); + let css = rgba.to_string(); + let hexString = cssHexString(css); + this._settings.set_string('group-apps-label-font-color-minimized', hexString); + })); + this._settings.bind('group-apps-use-fixed-width', this._builder.get_object('group_apps_use_fixed_width_switch'), 'active', @@ -1382,6 +1389,12 @@ const Settings = new Lang.Class({ this._builder.get_object('group_apps_label_font_color_colorbutton').set_rgba(rgba); }).apply(this); + (function() { + let rgba = new Gdk.RGBA(); + rgba.parse(this._settings.get_string('group-apps-label-font-color-minimized')); + this._builder.get_object('group_apps_label_font_color_minimized_colorbutton').set_rgba(rgba); + }).apply(this); + this._builder.get_object('group_apps_label_max_width_spinbutton').set_value(this._settings.get_int('group-apps-label-max-width')); this._builder.get_object('group_apps_label_max_width_spinbutton').connect('value-changed', Lang.bind (this, function(widget) { this._settings.set_int('group-apps-label-max-width', widget.get_value()); @@ -1401,6 +1414,11 @@ const Settings = new Lang.Class({ rgba.parse(this._settings.get_string('group-apps-label-font-color')); this._builder.get_object('group_apps_label_font_color_colorbutton').set_rgba(rgba); + this._settings.set_value('group-apps-label-font-color-minimized', this._settings.get_default_value('group-apps-label-font-color-minimized')); + let minimizedFontColor = new Gdk.RGBA(); + minimizedFontColor.parse(this._settings.get_string('group-apps-label-font-color-minimized')); + this._builder.get_object('group_apps_label_font_color_minimized_colorbutton').set_rgba(minimizedFontColor); + this._settings.set_value('group-apps-label-max-width', this._settings.get_default_value('group-apps-label-max-width')); this._builder.get_object('group_apps_label_max_width_spinbutton').set_value(this._settings.get_int('group-apps-label-max-width')); diff --git a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml index 147a8a0..61021a0 100644 --- a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml +++ b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml @@ -547,6 +547,11 @@ Application title font color When the applications are ungrouped, this defines the application titles font color. + + "#dddddd" + Minimized application title font color + When the applications are ungrouped, this defines the titles font color for minimized applications. + 160 Application title max width diff --git a/stylesheet.css b/stylesheet.css index 126789e..1319aa3 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -32,6 +32,7 @@ border: none; margin: 0; padding: 0; + background: none; } #dashtopanelScrollview .app-well-app .overview-label {