Don't show extra space for arrows when not needed.

[chaz/openbox] / openbox / focus_cycle_popup.c

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 24cbfb50ea16387b2dca5559eb4fdc3fe77f8ff1..2a0b24dcd2d0b11690f176cf1f3f8ffd978d0472 100644 (file)
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -189,8 +189,7 @@ void focus_cycle_popup_startup(gboolean reconfig)
                 {
                     /* the border of the target */
                     a = 0x88;
-                }
-                else {
+                } else {
                     /* the background of the target */
                     a = 0x22;
                 }
@@ -266,9 +265,9 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets,
             p->a_text->texture[0].data.text.string = text;
             maxwidth = MAX(maxwidth, RrMinWidth(p->a_text));
 
-            if (!create_targets)
+            if (!create_targets) {
                 g_free(text);
-            else {
+            } else {
                 ObFocusCyclePopupTarget *t = g_new(ObFocusCyclePopupTarget, 1);
 
                 t->client = ft;
@@ -338,6 +337,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
     gint list_mode_icon_column_w = HILITE_SIZE + OUTSIDE_BORDER;
     gint up_arrow_x, down_arrow_x;
     gint up_arrow_y, down_arrow_y;
+    gboolean showing_arrows = FALSE;
 
     g_assert(p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ||
              p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST);
@@ -376,9 +376,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
 
         /* how many rows do we need? */
         icon_rows = (p->n_targets-1) / icons_per_row + 1;
-
-    }
-    else {
+    } else {
         /* in list mode, there is one column of icons.. */
         icons_per_row = 1;
         /* maximum is 80% of the screen height */
@@ -396,16 +394,34 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
         /* leave space on the side for the icons */
         textw -= list_mode_icon_column_w;
 
+    if (!p->mapped)
+        /* reset the scrolling when the dialog is first shown */
+        p->scroll = 0;
+
+    /* show the scroll arrows when appropriate */
+    if (p->scroll && p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) {
+        XMapWindow(obt_display, p->list_mode_up);
+        showing_arrows = TRUE;
+    } else
+        XUnmapWindow(obt_display, p->list_mode_up);
+
+    if (p->scroll < p->n_targets - icon_rows &&
+        p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
+    {
+        XMapWindow(obt_display, p->list_mode_down);
+        showing_arrows = TRUE;
+    } else
+        XUnmapWindow(obt_display, p->list_mode_down);
+
     /* find the height of the dialog */
     h = t + b + (icon_rows * MAX(HILITE_SIZE, texth));
     if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS)
         /* in icon mode the text sits below the icons, so make some space */
         h += OUTSIDE_BORDER + texth;
-    else
+    else if (showing_arrows)
         h += ob_rr_theme->up_arrow_mask->height + OUTSIDE_BORDER
             + ob_rr_theme->down_arrow_mask->height + OUTSIDE_BORDER;
 
-
     /* center the icons if there is less than one row */
     if (icon_rows == 1)
         icons_center_x = (w - p->n_targets * HILITE_SIZE) / 2;
@@ -439,8 +455,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
             XMoveResizeWindow(obt_display, p->icon_mode_text,
                               icon_mode_textx, icon_mode_texty, textw, texth);
             XMapWindow(obt_display, popup.icon_mode_text);
-        }
-        else {
+        } else {
             XUnmapWindow(obt_display, popup.icon_mode_text);
 
             up_arrow_x = (w - ob_rr_theme->up_arrow_mask->width) / 2;
@@ -459,10 +474,6 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
                               ob_rr_theme->down_arrow_mask->width,
                               ob_rr_theme->down_arrow_mask->height);
         }
-
-
-        /* reset the scrolling when the dialog is first shown */
-        p->scroll = 0;
     }
 
     /* find the focused target */
@@ -488,8 +499,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
         if (top - selected_pos >= 0) {
             p->scroll -= top - selected_pos + 1;
             p->scroll = MAX(p->scroll, min_scroll);
-        }
-        else if (selected_pos - bottom >= 0) {
+        } else if (selected_pos - bottom >= 0) {
             p->scroll += selected_pos - bottom + 1;
             p->scroll = MIN(p->scroll, max_scroll);
         }
@@ -524,18 +534,6 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
                 ob_rr_theme->down_arrow_mask->height);
     }
 
-    /* show the scroll arrows when appropriate */
-    if (p->scroll && p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
-        XMapWindow(obt_display, p->list_mode_up);
-    else
-        XUnmapWindow(obt_display, p->list_mode_up);
-
-    if (p->scroll < p->n_targets - icon_rows &&
-        p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
-        XMapWindow(obt_display, p->list_mode_down);
-    else
-        XUnmapWindow(obt_display, p->list_mode_down);
-
     /* draw the icons and text */
     for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) {
         const ObFocusCyclePopupTarget *target = it->data;
@@ -555,7 +553,9 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
 
             /* find the coordinates for the icon */
             iconx = icons_center_x + l + (col * HILITE_SIZE);
-            icony = t + ob_rr_theme->up_arrow_mask->height + OUTSIDE_BORDER
+            icony = t + (showing_arrows ? ob_rr_theme->up_arrow_mask->height
+                                          + OUTSIDE_BORDER
+                         : 0)
                 + (row * MAX(texth, HILITE_SIZE))
                 + MAX(texth - HILITE_SIZE, 0) / 2;
 
@@ -580,8 +580,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
                     XMapWindow(obt_display, target->textwin);
                 else
                     XUnmapWindow(obt_display, target->textwin);
-            }
-            else {
+            } else {
                 XUnmapWindow(obt_display, target->textwin);
                 if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
                     XUnmapWindow(obt_display, target->iconwin);