[gnome-shell] [AppSwitcher] Make the background translucent again

[Dan Winship <danw src gnome org>]

commit 72dd458c80a5578172f7de4ba70614be074b773c
Author: Dan Winship <danw gnome org>
Date:   Sat Sep 26 12:08:16 2009 -0400

    [AppSwitcher] Make the background translucent again
    
    The default AppIcon gray border color isn't very visible against a
    dark gray background, but a white border looks too bold in the Well. So
    allow the caller to override the AppIcon border color, so that the Well
    can use gray-on-black and the AppSwitcher can use white-on-gray. (And
    then revert the AppSwitcher back to the translucent gray background.)
    
    https://bugzilla.gnome.org/show_bug.cgi?id=596337

 js/ui/altTab.js  |    7 ++++---
 js/ui/appIcon.js |   11 ++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index ca3f662..06d5509 100644
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -12,9 +12,9 @@ const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 
 const POPUP_BG_COLOR = new Clutter.Color();
-POPUP_BG_COLOR.from_pixel(0x000000ff);
-const POPUP_TRANSPARENT = new Clutter.Color();
-POPUP_TRANSPARENT.from_pixel(0x00000000);
+POPUP_BG_COLOR.from_pixel(0x00000080);
+const POPUP_APPICON_BORDER_COLOR = new Clutter.Color();
+POPUP_APPICON_BORDER_COLOR.from_pixel(0xffffffff);
 
 const POPUP_GRID_SPACING = 8;
 const POPUP_ICON_SIZE = 48;
@@ -66,6 +66,7 @@ AltTabPopup.prototype = {
 
         // FIXME?
         appIcon.actor.border = 2;
+        appIcon.highlight_border_color = POPUP_APPICON_BORDER_COLOR;
 
         this._icons.push(appIcon);
         this._currentWindows.push(appIcon.windows[0]);
diff --git a/js/ui/appIcon.js b/js/ui/appIcon.js
index a0bb243..b5d8193 100644
--- a/js/ui/appIcon.js
+++ b/js/ui/appIcon.js
@@ -28,8 +28,8 @@ const APPICON_CORNER_RADIUS = 4;
 
 const APPICON_MENU_POPUP_TIMEOUT_MS = 600;
 
-const APPICON_BORDER_COLOR = new Clutter.Color();
-APPICON_BORDER_COLOR.from_pixel(0x787878ff);
+const APPICON_DEFAULT_BORDER_COLOR = new Clutter.Color();
+APPICON_DEFAULT_BORDER_COLOR.from_pixel(0x787878ff);
 const APPICON_MENU_BACKGROUND_COLOR = new Clutter.Color();
 APPICON_MENU_BACKGROUND_COLOR.from_pixel(0x292929ff);
 const APPICON_MENU_FONT = 'Sans 14px';
@@ -64,6 +64,7 @@ AppIcon.prototype = {
                                            padding: APPICON_PADDING,
                                            reactive: true });
         this.actor._delegate = this;
+        this.highlight_border_color = APPICON_DEFAULT_BORDER_COLOR;
 
         if (menuType != MenuType.NONE) {
             this.windows = Shell.AppMonitor.get_default().get_windows_for_app(appInfo.get_id());
@@ -178,7 +179,7 @@ AppIcon.prototype = {
 
     setHighlight: function(highlight) {
         if (highlight) {
-            this.actor.border_color = APPICON_BORDER_COLOR;
+            this.actor.border_color = this.highlight_border_color;
         } else {
             this.actor.border_color = TRANSPARENT_COLOR;
         }
@@ -273,7 +274,7 @@ AppIconMenu.prototype = {
         this.actor.connect('allocate', Lang.bind(this, this._allocate));
 
         this._windowContainer = new Shell.Menu({ orientation: Big.BoxOrientation.VERTICAL,
-                                                 border_color: APPICON_BORDER_COLOR,
+                                                 border_color: source.highlight_border_color,
                                                  border: APPICON_MENU_BORDER_WIDTH,
                                                  background_color: APPICON_MENU_BACKGROUND_COLOR,
                                                  padding: 4,
@@ -297,7 +298,7 @@ AppIconMenu.prototype = {
         this._arrow.connect('redraw', Lang.bind(this, function (area, texture) {
             Shell.draw_box_pointer(texture,
                                    this._type == MenuType.ON_RIGHT ? Clutter.Gravity.WEST : Clutter.Gravity.NORTH,
-                                   APPICON_BORDER_COLOR,
+                                   source.highlight_border_color,
                                    APPICON_MENU_BACKGROUND_COLOR);
         }));
         this.actor.add_actor(this._arrow);