merge r6255 from trunk

diff --git a/openbox/frame.c b/openbox/frame.c
index 1f45ea8b145217d7d72beaf8c8232dde8e0c1325..5fd3671480e5c08b1e4991787b47b4b8d1c25367 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -728,9 +728,9 @@ static void layout_title(ObFrame *self)
             } else if (*lc == 'N') {
                 if (firstcon) *firstcon = OB_FRAME_CONTEXT_ICON;
                 if ((self->icon_on = is_button_present(self, lc, i))) {
-                    /* icon gets extra padding */
+                    /* icon is bigger than buttons */
                     self->label_width -= bwidth + 2;
-                    self->icon_x = x + (i * 1);
+                    self->icon_x = x;
                     x += i * (bwidth + 2);
                 }
             } else if (*lc == 'D') {