X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fpopup.c;h=d49148fffbc8727320aa7bca6da1429fbe1b5598;hb=9713a629d77ec43d98d8fba256fbdbcd3b9c46c8;hp=6099edcb2d237c5000c2e5e9db9b5c9a1aef6181;hpb=8349e4ca6ba679a6a43cd56a282502eacafc580d;p=chaz%2Fopenbox

diff --git a/openbox/popup.c b/openbox/popup.c
index 6099edcb..d49148ff 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -46,7 +46,7 @@ ObPopup *popup_new()
                              0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
                              InputOutput, RrVisual(ob_rr_inst),
                              CWOverrideRedirect, &attrib);
-    
+
     self->text = XCreateWindow(ob_display, self->bg,
                                0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
                                InputOutput, RrVisual(ob_rr_inst), 0, NULL);
@@ -110,7 +110,7 @@ void popup_text_width_to_string(ObPopup *self, gchar *text)
         self->a_text->texture[0].data.text.string = text;
         self->textw = RrMinWidth(self->a_text);
     } else
-        self->textw = 0;    
+        self->textw = 0;
 }
 
 void popup_height_to_string(ObPopup *self, gchar *text)
@@ -138,7 +138,7 @@ void popup_set_text_align(ObPopup *self, RrJustify align)
 static gboolean popup_show_timeout(gpointer data)
 {
     ObPopup *self = data;
-    
+
     XMapWindow(ob_display, self->bg);
     stacking_raise(INTERNAL_AS_WINDOW(self));
     self->mapped = TRUE;
@@ -154,11 +154,18 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
     gint emptyx, emptyy; /* empty space between elements */
     gint textx, texty, textw, texth;
     gint iconx, icony, iconw, iconh;
-    Rect *area;
+    Rect *area, mon;
 
-    area = screen_physical_area();
+    RECT_SET(mon, self->x, self->y, 1, 1);
+    area = screen_physical_area_monitor(screen_find_monitor(&mon));
 
-    RrMargins(self->a_bg, &l, &t, &r, &b);
+    /* when there is no icon and the text is not parent relative, then
+       fill the whole dialog with the text appearance, don't use the bg at all
+    */
+    if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL)
+        RrMargins(self->a_bg, &l, &t, &r, &b);
+    else
+        l = t = r = b = 0;
 
     /* set up the textures */
     self->a_text->texture[0].data.text.string = text;
@@ -195,6 +202,17 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
     texty = (h - texth - emptyy) / 2 + t + ob_rr_theme->paddingy;
     icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy;
 
+    /* when there is no icon, then fill the whole dialog with the text
+       appearance
+    */
+    if (!self->hasicon)
+    {
+        textx = texty = 0;
+        texth += emptyy;
+        textw += emptyx;
+        emptyx = emptyy = 0;
+    }
+
     w = textw + emptyx + iconw;
     /* cap it at maxw/minw */
     if (self->maxw) w = MIN(w, self->maxw);
@@ -230,10 +248,14 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 
     x=MAX(MIN(x, area->width-w),0);
     y=MAX(MIN(y, area->height-h),0);
-    
+
     /* set the windows/appearances up */
     XMoveResizeWindow(ob_display, self->bg, x, y, w, h);
-    RrPaint(self->a_bg, self->bg, w, h);
+    /* when there is no icon and the text is not parent relative, then
+       fill the whole dialog with the text appearance, don't use the bg at all
+    */
+    if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL)
+        RrPaint(self->a_bg, self->bg, w, h);
 
     if (textw) {
         self->a_text->surface.parent = self->a_bg;
@@ -260,6 +282,8 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
             popup_show_timeout(self);
         }
     }
+
+    g_free(area);
 }
 
 void popup_hide(ObPopup *self)
@@ -499,7 +523,7 @@ void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
         for (i = self->desks; i < screen_num_desktops; ++i) {
             XSetWindowAttributes attr;
 
-            attr.border_pixel = 
+            attr.border_pixel =
                 RrColorPixel(ob_rr_theme->osd_border_color);
             self->wins[i] = XCreateWindow(ob_display, self->popup->bg,
                                           0, 0, 1, 1, ob_rr_theme->obwidth,