center the text and icon vertically

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index a5906d25235e3aac31095a331f9b1599c8e0c9e5..dddb788f1352d469a1146dc62c9e361b8b5f452a 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -642,10 +642,10 @@ void screen_desktop_popup(guint d, gboolean show)
         pager_popup_position(desktop_cycle_popup, CenterGravity,
                              a->x + a->width / 2, a->y + a->height / 2);
         pager_popup_icon_size_multiplier(desktop_cycle_popup,
-                                         screen_desktop_layout.columns /
-                                         screen_desktop_layout.rows / 2,
-                                         screen_desktop_layout.rows/
-                                         screen_desktop_layout.columns / 2);
+                                         (screen_desktop_layout.columns /
+                                          screen_desktop_layout.rows) / 2,
+                                         (screen_desktop_layout.rows/
+                                          screen_desktop_layout.columns) / 2);
         pager_popup_max_width(desktop_cycle_popup,
                               MAX(a->width/3, POPUP_WIDTH));
         pager_popup_show(desktop_cycle_popup, screen_desktop_names[d], d);
@@ -659,11 +659,12 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
     static guint d = (guint)-1;
     guint ret;
 
+    if (d == (guint)-1)
+        d = screen_desktop;
+
     if ((cancel || done) && dialog)
         goto show_cycle_dialog;
 
-    if (d == (guint)-1)
-        d = screen_desktop;
     get_row_col(d, &r, &c);
 
     if (linear) {