X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=c862933c0da115b7329eac3b5219368c7ca0d7ab;hb=892107d3ba483fe9356d66c5b62496d7fa332020;hp=d5b707ede87f56e95902ce94e5e6a2b55e1727d2;hpb=ad3bf0cea4d471ccb821227f1df485a8c639fca0;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index d5b707ed..c862933c 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -339,8 +339,11 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, w = MAX(w, POPUP_WIDTH); /* min width */ /* get the text height */ - texth = MAX(RrMinHeight(p->a_text), RrMinHeight(p->a_hilite_text)) + - TEXT_BORDER * 2; + texth = RrMinHeight(p->a_hilite_text); + if (mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) + texth = MAX(MAX(texth, RrMinHeight(p->a_text)), ICON_SIZE); + else + texth += TEXT_BORDER * 2; if (mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) { /* how many icons will fit in that row? make the width fit that */