X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=e282465e4d44295d56244a1e5da2f8b3855cf9b2;hb=8262e1ba669cb8959734892d2657653766f5cc7e;hp=807680af1f89962e8196c50bcdc7141041c8610d;hpb=ea272a93efe26bb6c0b0d9278cee4a67cc9c872e;p=chaz%2Fopenbox

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 807680af..e282465e 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -25,12 +25,13 @@
 #include "focus_cycle.h"
 #include "openbox.h"
 #include "window.h"
+#include "event.h"
 #include "render/render.h"
 
 #include <X11/Xlib.h>
 #include <glib.h>
 
-#define ICON_SIZE 48
+#define ICON_SIZE 40
 #define ICON_HILITE_WIDTH 2
 #define ICON_HILITE_MARGIN 1
 #define OUTSIDE_BORDER 3
@@ -289,7 +290,7 @@ 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) + (OUTSIDE_BORDER + texth);
+    h = t + b + (icon_rows * ICON_SIZE) + (OUTSIDE_BORDER*2 + texth);
 
     /* get the position of the text */
     textx = l;
@@ -466,6 +467,9 @@ void focus_cycle_popup_hide()
 
     popup.mapped = FALSE;
 
+    /* kill enter events cause by this unmapping */
+    event_ignore_all_queued_enters();
+
     while(popup.targets) {
         ObFocusCyclePopupTarget *t = popup.targets->data;