From 0de1fd496f3ca61080cee21138cd1aaa83a5e1db Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 19 May 2007 20:34:34 +0000 Subject: [PATCH] center the icons when there is only 1 row --- openbox/focus_cycle_popup.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index b171e942..bbeba943 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -234,6 +234,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) gint icon_rows; gint textx, texty, textw, texth; gint rgbax, rgbay, rgbaw, rgbah; + gint icons_center_x; gint innerw, innerh; gint i; GList *it; @@ -292,6 +293,12 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) rgbaw = w - ml - mr; rgbah = h - mt - mb; + /* center the icons if there is less than one row */ + if (icon_rows == 1) + icons_center_x = (w - p->n_targets * ICON_SIZE) / 2; + else + icons_center_x; + if (!p->mapped) { /* position the background but don't draw it*/ XMoveResizeWindow(ob_display, p->bg, x, y, w, h); @@ -317,7 +324,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) if (target->client == c) { /* save the target */ newtarget = target; - newtargetx = l + (col * ICON_SIZE); + newtargetx = icons_center_x + l + (col * ICON_SIZE); newtargety = t + (row * ICON_SIZE); if (!p->mapped) @@ -385,7 +392,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) gint innerx, innery; /* find the dimensions of the icon inside it */ - innerx = l + (col * ICON_SIZE); + innerx = icons_center_x + l + (col * ICON_SIZE); innerx += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN; innery = t + (row * ICON_SIZE); innery += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN; -- 2.45.2