X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Ffocus_cycle_popup.c;h=42c3fed6ae48bc7c07101f2bbb06226c3e889f8d;hb=9b447a2d2837a6dab0380bc767644f8fe5083aa9;hp=9f3fa3e86493ddee346e206d3b572400938a0959;hpb=76464a604ee2999b00b806be25722f7fcac1cd9c;p=chaz%2Fopenbox

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 9f3fa3e8..42c3fed6 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -343,8 +343,8 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c,
     if (mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) {
         /* how many icons will fit in that row? make the width fit that */
         w -= l + r;
-        icons_per_row = (w + ICON_SIZE - 1) / ICON_SIZE;
-        w = icons_per_row * ICON_SIZE + l + r;
+        icons_per_row = (w + HILITE_SIZE - 1) / HILITE_SIZE;
+        w = icons_per_row * HILITE_SIZE + l + r;
 
         /* how many rows do we need? */
         icon_rows = (p->n_targets-1) / icons_per_row + 1;
@@ -372,7 +372,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c,
 
     /* center the icons if there is less than one row */
     if (icon_rows == 1)
-        icons_center_x = (w - p->n_targets * ICON_SIZE) / 2;
+        icons_center_x = (w - p->n_targets * HILITE_SIZE) / 2;
     else
         icons_center_x = 0;
 
@@ -445,9 +445,6 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c,
             /* find the dimensions of the text box */
             list_mode_textx = iconx + HILITE_SIZE + TEXT_BORDER;
             list_mode_texty = icony + HILITE_OFFSET;
-//            textw = w
-//                    /* left edge */  - innerx - HILITE_SIZE - TEXT_BORDER
-//                    /* right edge */ - OUTSIDE_BORDER - TEXT_BORDER;
 
             /* position the icon */
             XMoveResizeWindow(obt_display, target->iconwin,