set a OB_ICONIFY_ALPHA define in misc.h for the 3 places to all use

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index b61efcef3041fedfef6cbd1728a3857edc03d555..cf85fd65b87468f2e06fc08ee313f0345707f756 100644 (file)
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -82,8 +82,8 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
                     e->data.normal.icon_width = icon->width;
                     e->data.normal.icon_height = icon->height;
                     e->data.normal.icon_data = icon->data;
-                    /* 7/16 opacity if iconic */
-                    e->data.normal.icon_alpha = c->iconic ? 0x70 : 0xff;
+                    e->data.normal.icon_alpha =
+                        c->iconic ? OB_ICONIC_ALPHA : 0xff;
                 }
             }
         }

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index cc8198752a631b08f589f4d0a8fb1db9aeb712c1..258646843a9a68d46c56175ec3780eca8f597986 100644 (file)
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -84,8 +84,7 @@ static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data)
                 e->data.normal.icon_width = icon->width;
                 e->data.normal.icon_height = icon->height;
                 e->data.normal.icon_data = icon->data;
-                /* 7/16 opacity if iconic */
-                e->data.normal.icon_alpha = c->iconic ? 0x70 : 0xff;
+                e->data.normal.icon_alpha = c->iconic ? OB_ICONIC_ALPHA : 0xff;
             }
         }
     }

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index b76793b1ed6581f819d3940068cfd1b83a933e07..8e58c935ebf150960bb16d2e61fe9b8aaed15ffe 100644 (file)
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -421,9 +421,8 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
             icon = client_icon(target->client, innerw, innerh);
             p->a_icon->texture[0].data.rgba.width = icon->width;
             p->a_icon->texture[0].data.rgba.height = icon->height;
-            /* 7/16 alpha for iconic windows */
             p->a_icon->texture[0].data.rgba.alpha =
-                target->client->iconic ? 0x70 : 0xff;
+                target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
             p->a_icon->texture[0].data.rgba.data = icon->data;
 
             /* draw the icon */

diff --git a/openbox/misc.h b/openbox/misc.h
index f55feed94e47799bb0fbdc6c6361e5f58dfbd672..2b5584d73072e84a24a1cf7a8837a27c3e46c4ab 100644 (file)
--- a/openbox/misc.h
+++ b/openbox/misc.h
@@ -19,6 +19,12 @@
 #ifndef __ob__misc_h
 #define __ob__misc_h
 
+/*! The alpha value to use for icons of iconified windows in various places
+  like the focus cycle popup and client list menus.
+  Give iconic windows 7/16 alpha. A little under 50%.
+ */
+#define OB_ICONIC_ALPHA 0x70
+
 typedef enum
 {
     OB_CURSOR_NONE,