From 8019fe8cc1940362b631cefeddbdd50026756cb0 Mon Sep 17 00:00:00 2001 From: Tom Perez <60866122+tper0700@users.noreply.github.com> Date: Fri, 1 May 2020 02:31:28 -0700 Subject: [PATCH 1/5] Use transparent backgrounds for show-apps-icon --- appIcons.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appIcons.js b/appIcons.js index 3347de4..bf8b0ea 100644 --- a/appIcons.js +++ b/appIcons.js @@ -1622,12 +1622,17 @@ var ShowAppsIconWrapper = Utils.defineClass({ let customIconPath = Me.settings.get_string('show-apps-icon-file'); + this.actor.set_style("background-color: transparent;"); + this.realShowAppsIcon.icon.set_style("background-color: transparent;"); + this.realShowAppsIcon.icon.createIcon = function(size) { this._iconActor = new St.Icon({ icon_name: 'view' + (Config.PACKAGE_VERSION < '3.20' ? '' : '-app') + '-grid-symbolic', icon_size: size, style_class: 'show-apps-icon', track_hover: true }); + this._iconActor.set_style("background-color: transparent;"); + if (customIconPath) { this._iconActor.gicon = new Gio.FileIcon({ file: Gio.File.new_for_path(customIconPath) }); } From f5d022ebeefe4d100347565ed80ffcfa2dc10d16 Mon Sep 17 00:00:00 2001 From: Milos Levacic Date: Sun, 3 May 2020 00:17:18 +0200 Subject: [PATCH 2/5] Configurable minimized application title font color --- Settings.ui | 43 +++++++++++++++++++ appIcons.js | 13 +++++- .../sources/D2P_import settings/Artist_design | 1 + .../D2P_import settings/Fortnite_Brite gunner | 1 + .../D2P_import settings/Galaxy_bizouneur | 1 + .../D2P_import settings/Ghibli_student | 1 + .../D2P_import settings/Mountain_intellihide | 1 + .../D2P_import settings/Plants_Solitaire | 1 + .../D2P_import settings/Star Wars_gamer | 1 + .../D2P_import settings/Wolf_programmer | 1 + prefs.js | 18 ++++++++ ...shell.extensions.dash-to-panel.gschema.xml | 5 +++ 12 files changed, 86 insertions(+), 1 deletion(-) diff --git a/Settings.ui b/Settings.ui index 8949c9f..630ac15 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 a744408..7ed625e 100644 --- a/media/sources/D2P_import settings/Artist_design +++ b/media/sources/D2P_import settings/Artist_design @@ -30,6 +30,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='#777777' 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 75f5744..6701759 100644 --- a/media/sources/D2P_import settings/Fortnite_Brite gunner +++ b/media/sources/D2P_import settings/Fortnite_Brite gunner @@ -30,6 +30,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='#777777' 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 17d52d8..4c4defc 100644 --- a/media/sources/D2P_import settings/Galaxy_bizouneur +++ b/media/sources/D2P_import settings/Galaxy_bizouneur @@ -30,6 +30,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='#777777' 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 1bcefa0..cb1fd2d 100644 --- a/media/sources/D2P_import settings/Ghibli_student +++ b/media/sources/D2P_import settings/Ghibli_student @@ -30,6 +30,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='#777777' 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 8b46192..738b5dc 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='#777777' 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 a4c0ae7..4ab4d6c 100644 --- a/media/sources/D2P_import settings/Plants_Solitaire +++ b/media/sources/D2P_import settings/Plants_Solitaire @@ -30,6 +30,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='#777777' 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 325622f..5484340 100644 --- a/media/sources/D2P_import settings/Star Wars_gamer +++ b/media/sources/D2P_import settings/Star Wars_gamer @@ -30,6 +30,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='#777777' 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 3bfa1f8..6a740ce 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='#777777' tray-padding=-1 trans-min-panel-opacity=0.32000000000000001 enter-peek-mode-timeout=500 diff --git a/prefs.js b/prefs.js index 9ae567c..2be9623 100644 --- a/prefs.js +++ b/prefs.js @@ -1282,6 +1282,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', @@ -1326,6 +1333,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()); @@ -1345,6 +1358,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 1b80e40..9a39790 100644 --- a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml +++ b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml @@ -562,6 +562,11 @@ Application title font color When the applications are ungrouped, this defines the application titles font color. + + "#777777" + Minimized application title font color + When the applications are ungrouped, this defines the titles font color for minimized applications. + 160 Application title max width From 995efdaeb536d2ffe9b37ce605c4f39c02bd1d64 Mon Sep 17 00:00:00 2001 From: Milos Levacic Date: Sun, 17 May 2020 01:29:11 +0200 Subject: [PATCH 3/5] Default to the same color for minimized app labels as unminimized ones --- media/sources/D2P_import settings/Artist_design | 2 +- media/sources/D2P_import settings/Fortnite_Brite gunner | 2 +- media/sources/D2P_import settings/Galaxy_bizouneur | 2 +- media/sources/D2P_import settings/Ghibli_student | 2 +- media/sources/D2P_import settings/Mountain_intellihide | 2 +- media/sources/D2P_import settings/Plants_Solitaire | 2 +- media/sources/D2P_import settings/Star Wars_gamer | 2 +- media/sources/D2P_import settings/Wolf_programmer | 2 +- schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/media/sources/D2P_import settings/Artist_design b/media/sources/D2P_import settings/Artist_design index 7ed625e..55638e2 100644 --- a/media/sources/D2P_import settings/Artist_design +++ b/media/sources/D2P_import settings/Artist_design @@ -30,7 +30,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='#777777' +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 6701759..fc923a7 100644 --- a/media/sources/D2P_import settings/Fortnite_Brite gunner +++ b/media/sources/D2P_import settings/Fortnite_Brite gunner @@ -30,7 +30,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='#777777' +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 4c4defc..06fb023 100644 --- a/media/sources/D2P_import settings/Galaxy_bizouneur +++ b/media/sources/D2P_import settings/Galaxy_bizouneur @@ -30,7 +30,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='#777777' +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 cb1fd2d..6b7e3fe 100644 --- a/media/sources/D2P_import settings/Ghibli_student +++ b/media/sources/D2P_import settings/Ghibli_student @@ -30,7 +30,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='#777777' +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 738b5dc..6d00a91 100644 --- a/media/sources/D2P_import settings/Mountain_intellihide +++ b/media/sources/D2P_import settings/Mountain_intellihide @@ -1,6 +1,6 @@ [/] group-apps-label-font-color='#dddddd' -group-apps-label-font-color-minimized='#777777' +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 4ab4d6c..b396b33 100644 --- a/media/sources/D2P_import settings/Plants_Solitaire +++ b/media/sources/D2P_import settings/Plants_Solitaire @@ -30,7 +30,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='#777777' +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 5484340..351d5b3 100644 --- a/media/sources/D2P_import settings/Star Wars_gamer +++ b/media/sources/D2P_import settings/Star Wars_gamer @@ -30,7 +30,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='#777777' +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 6a740ce..482d2d2 100644 --- a/media/sources/D2P_import settings/Wolf_programmer +++ b/media/sources/D2P_import settings/Wolf_programmer @@ -1,6 +1,6 @@ [/] group-apps-label-font-color='#dddddd' -group-apps-label-font-color-minimized='#777777' +group-apps-label-font-color-minimized='#dddddd' tray-padding=-1 trans-min-panel-opacity=0.32000000000000001 enter-peek-mode-timeout=500 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 9a39790..59551a4 100644 --- a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml +++ b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml @@ -563,7 +563,7 @@ When the applications are ungrouped, this defines the application titles font color. - "#777777" + "#dddddd" Minimized application title font color When the applications are ungrouped, this defines the titles font color for minimized applications. From a40e7074e054cf1a2016988e5136677a3b442c31 Mon Sep 17 00:00:00 2001 From: Tom Perez <60866122+tper0700@users.noreply.github.com> Date: Sun, 17 May 2020 00:15:08 -0700 Subject: [PATCH 4/5] Revert "Use transparent backgrounds for show-apps-icon" This reverts commit 8019fe8cc1940362b631cefeddbdd50026756cb0. --- appIcons.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/appIcons.js b/appIcons.js index bf8b0ea..3347de4 100644 --- a/appIcons.js +++ b/appIcons.js @@ -1622,17 +1622,12 @@ var ShowAppsIconWrapper = Utils.defineClass({ let customIconPath = Me.settings.get_string('show-apps-icon-file'); - this.actor.set_style("background-color: transparent;"); - this.realShowAppsIcon.icon.set_style("background-color: transparent;"); - this.realShowAppsIcon.icon.createIcon = function(size) { this._iconActor = new St.Icon({ icon_name: 'view' + (Config.PACKAGE_VERSION < '3.20' ? '' : '-app') + '-grid-symbolic', icon_size: size, style_class: 'show-apps-icon', track_hover: true }); - this._iconActor.set_style("background-color: transparent;"); - if (customIconPath) { this._iconActor.gicon = new Gio.FileIcon({ file: Gio.File.new_for_path(customIconPath) }); } From 5243edd92fa3d2283a8772ffa160426b4532d430 Mon Sep 17 00:00:00 2001 From: Tom Perez <60866122+tper0700@users.noreply.github.com> Date: Sun, 17 May 2020 00:22:29 -0700 Subject: [PATCH 5/5] Override show-apps background for transparent icons. --- stylesheet.css | 1 + 1 file changed, 1 insertion(+) diff --git a/stylesheet.css b/stylesheet.css index 4a7a6b6..4d4e748 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -31,6 +31,7 @@ border: none; margin: 0; padding: 0; + background: none; } #dashtopanelScrollview .app-well-app .overview-label {