always set the multipliers just dont allow 0

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index 50f0dc61cda6a8465f2c7687d3186996016d60a7..5fd3671480e5c08b1e4991787b47b4b8d1c25367 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -34,7 +34,7 @@
 #define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
                          ButtonPressMask | ButtonReleaseMask)
 #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
-                           ButtonMotionMask | \
+                           ButtonMotionMask | PointerMotionMask | \
                            EnterWindowMask | LeaveWindowMask)
 /* The inner window does not need enter/leave events.
    If it does get them, then it needs its own context for enter events
@@ -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') {