M openbox/popup.c → openbox/popup.c

@@ -91,6 +91,7 @@ 
 void popup_width(ObPopup *self, gint w)
 {
     self->w = w;
+    self->maxw = w;
 }
 
 void popup_height(ObPopup *self, gint h)
@@ -104,19 +105,9 @@ }
 
 void popup_width_to_string(ObPopup *self, gchar *text, gint max)
 {
-    gint textw, iconw;
-
     self->a_text->texture[0].data.text.string = text;
-    textw = RrMinWidth(self->a_text);
-    if (self->hasicon) {
-        gint texth = RrMinHeight(self->a_text) + ob_rr_theme->paddingy * 2;
-        iconw = texth;
-    } else
-        iconw = 0;
-    self->w = textw + iconw + ob_rr_theme->paddingx * (self->hasicon ? 3 : 2);
-    /* cap it at "max" */
-    if (max > 0)
-        self->w = MIN(self->w, max);
+    self->w = RrMinWidth(self->a_text);
+    self->maxw = max;
 }
 
 void popup_height_to_string(ObPopup *self, gchar *text)
@@ -124,12 +115,12 @@ {
     self->h = RrMinHeight(self->a_text) + ob_rr_theme->paddingy * 2;
 }
 
-void popup_width_to_strings(ObPopup *self, gchar **strings, gint max)
+void popup_width_to_strings(ObPopup *self, gchar **strings, gint num, gint max)
 {
     gint i, maxw;
 
     maxw = 0;
-    for (i = 0; strings[i] != NULL; ++i) {
+    for (i = 0; i < num; ++i) {
         popup_width_to_string(self, strings[i], max);
         maxw = MAX(maxw, self->w);
     }
@@ -174,13 +165,13 @@ texth = h - (t+b + ob_rr_theme->paddingy * 2);
     } else
         h = t+b + texth + ob_rr_theme->paddingy * 2;
     iconw = (self->hasicon ? texth : 0);
-    if (self->w) {
-        w = self->w;
-        textw = w - (l+r + iconw + ob_rr_theme->paddingx *
-                     (self->hasicon ? 3 : 2));
-    } else
-        w = l+r + textw + iconw + ob_rr_theme->paddingx *
-            (self->hasicon ? 3 : 2);
+    if (self->w)
+        textw = self->w;
+    w = l+r + textw + iconw + ob_rr_theme->paddingx *
+        (self->hasicon ? 3 : 2);
+    /* cap it at "maxw" */
+    w = MIN(w, self->maxw);
+
     /* sanity checks to avoid crashes! */
     if (w < 1) w = 1;
     if (h < 1) h = 1;
@@ -452,6 +443,7 @@ self->wins = g_new(Window, self->desks);
     self->hilight = RrAppearanceCopy(ob_rr_theme->osd_hilite_fg);
     self->unhilight = RrAppearanceCopy(ob_rr_theme->osd_unhilite_fg);
 
+    self->popup->hasicon = TRUE;
     self->popup->draw_icon = pager_popup_draw_icon;
     self->popup->draw_icon_data = self;
 

M openbox/popup.h → openbox/popup.h

@@ -47,6 +47,7 @@ gint x;
     gint y;
     gint w;
     gint h;
+    gint maxw;
     gboolean mapped;
     gboolean delay_mapped;
  
@@ -88,7 +89,7 @@ void popup_width(ObPopup *self, gint w);
 void popup_height(ObPopup *self, gint w);
 void popup_width_to_string(ObPopup *self, gchar *text, gint max);
 void popup_height_to_string(ObPopup *self, gchar *text);
-void popup_width_to_strings(ObPopup *self, gchar **strings, gint max);
+void popup_width_to_strings(ObPopup *self, gchar **strings, gint num,gint max);
 
 void popup_set_text_align(ObPopup *self, RrJustify align);
 
@@ -109,10 +110,10 @@ #define icon_popup_hide(p) popup_hide((p)->popup)
 #define icon_popup_position(p, g, x, y) popup_position((p)->popup,(g),(x),(y))
 #define icon_popup_width(p, w) popup_width((p)->popup,(w))
 #define icon_popup_height(p, h) popup_height((p)->popup,(h))
-#define icon_popup_width_to_string(p, s, m) \
-    popup_width_to_string((p)->popup,(s),(m))
-#define icon_popup_width_to_strings(p, s, m) \
-    popup_width_to_strings((p)->popup,(s),(m))
+#define icon_popup_width_to_string(p, s, n, m) \
+    popup_width_to_string((p)->popup,(s),(n),(m))
+#define icon_popup_width_to_strings(p, s, n, m) \
+    popup_width_to_strings((p)->popup,(s),(n),(m))
 #define icon_popup_set_text_align(p, j) popup_set_text_align((p)->popup,(j))
 
 ObPagerPopup *pager_popup_new();
@@ -125,10 +126,10 @@ #define pager_popup_hide(p) popup_hide((p)->popup)
 #define pager_popup_position(p, g, x, y) popup_position((p)->popup,(g),(x),(y))
 #define pager_popup_width(p, w) popup_width((p)->popup,(w))
 #define pager_popup_height(p, h) popup_height((p)->popup,(h))
-#define pager_popup_width_to_string(p, s, m) \
-    popup_width_to_string((p)->popup,(s),(m))
-#define pager_popup_width_to_strings(p, s, m) \
-    popup_width_to_strings((p)->popup,(s),(m))
+#define pager_popup_width_to_string(p, s, n, m) \
+    popup_width_to_string((p)->popup,(s),(n),(m))
+#define pager_popup_width_to_strings(p, s, n, m) \
+    popup_width_to_strings((p)->popup,(s),(n),(m))
 #define pager_popup_set_text_align(p, j) popup_set_text_align((p)->popup,(j))
 
 #endif