merge 7377-79 from trunk

diff --git a/openbox/client.c b/openbox/client.c
index ee8001c9cda89b77e395a1a816c361a2e344beec..4cfece1dd2e8996bcc83632ab195e8b70ebfab46 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -411,10 +411,11 @@ void client_manage(Window window)
                                 splash screens get "transient" set to TRUE by
                                 the place_client call
                              */
-                             transient ||
-                             (!(self->positioned & USPosition) &&
-                              client_normal(self) &&
-                              !self->session));
+                             ob_state() == OB_STATE_RUNNING &&
+                             (transient ||
+                              (!(self->positioned & USPosition) &&
+                               client_normal(self) &&
+                               !self->session)));
     }
 
     /* if the window isn't user-sized, then make it fit inside
@@ -426,10 +427,11 @@ void client_manage(Window window)
        splash screens get "transient" set to TRUE by
        the place_client call
     */
-    if (transient ||
-        (!(self->sized & USSize) &&
-         client_normal(self) &&
-         !self->session))
+    if (ob_state() == OB_STATE_RUNNING &&
+        (transient ||
+         (!(self->sized & USSize) &&
+          client_normal(self) &&
+          !self->session)))
     {
         /* make a copy to modify */
         Rect a = *screen_area_monitor(self->desktop, client_monitor(self));

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 8ae4e7e8ac78c3e6c6553fc3bdd1fe372879ea04..89468493470b044cbfb0727614e30c957e1ad05d 100644 (file)
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -35,6 +35,7 @@
 #define ICON_HILITE_WIDTH 2
 #define ICON_HILITE_MARGIN 1
 #define OUTSIDE_BORDER 3
+#define TEXT_BORDER 2
 
 typedef struct _ObFocusCyclePopup       ObFocusCyclePopup;
 typedef struct _ObFocusCyclePopupTarget ObFocusCyclePopupTarget;
@@ -287,10 +288,10 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
 
     /* get the text dimensions */
     textw = w - l - r;
-    texth = RrMinHeight(p->a_text);
+    texth = RrMinHeight(p->a_text) + TEXT_BORDER * 2;
 
     /* find the height of the dialog */
-    h = t + b + (icon_rows * ICON_SIZE) + (OUTSIDE_BORDER*2 + texth);
+    h = t + b + (icon_rows * ICON_SIZE) + (OUTSIDE_BORDER + texth);
 
     /* get the position of the text */
     textx = l;

diff --git a/openbox/popup.c b/openbox/popup.c
index 2fb275cafaffe2f5737448b9ed6c75dc9a93b2ff..a52a23dbe4e67ad5d7c781447aa34c41dad7e043 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -202,10 +202,10 @@ 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 and the text is not parent relative, then 
-       fill the whole dialog with the text appearance, don't use the bg at all
+    /* when there is no icon, then fill the whole dialog with the text
+       appearance
     */
-    if (!(self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL))
+    if (!self->hasicon)
     {
         textx = texty = 0;
         texth += emptyy;