From: Dana Jansens Date: Sat, 19 May 2007 19:05:47 +0000 (+0000) Subject: better positioning and some spacing X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=4305448a62716170f042033787ddb60891f0d654;p=chaz%2Fopenbox better positioning and some spacing --- diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index 5e4d7a9c..0dbc95f0 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -32,6 +32,7 @@ #define ICON_SIZE 48 #define ICON_HILITE_WIDTH 2 +#define OUTSIDE_BORDER 2 typedef struct _ObFocusCyclePopup ObFocusCyclePopup; typedef struct _ObFocusCyclePopupTarget ObFocusCyclePopupTarget; @@ -235,10 +236,10 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* get the outside margins */ RrMargins(p->a_bg, &l, &t, &r, &b); - l += ob_rr_theme->paddingx; - r += ob_rr_theme->paddingx; - t += ob_rr_theme->paddingy; - b += ob_rr_theme->paddingy; + l += ob_rr_theme->paddingx + OUTSIDE_BORDER; + r += ob_rr_theme->paddingx + OUTSIDE_BORDER; + t += ob_rr_theme->paddingy + OUTSIDE_BORDER; + b += ob_rr_theme->paddingy + OUTSIDE_BORDER; /* get the icons sizes */ iconw = ICON_SIZE - (ICON_HILITE_WIDTH + ob_rr_theme->paddingx) * 2; @@ -262,11 +263,12 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) texth = RrMinHeight(p->a_text); /* find the height of the dialog */ - h = t + b + (icon_rows * ICON_SIZE) + (ob_rr_theme->paddingy + texth); + h = t + b + (icon_rows * ICON_SIZE) + + (ob_rr_theme->paddingy * 2 + OUTSIDE_BORDER + texth); /* get the position of the text */ textx = l; - texty = h - texth; + texty = h - texth - b; /* find the position for the popup (include the outer borders) */ x = screen_area->x + (screen_area->width -