diff options
| -rw-r--r-- | openbox/menuframe.c | 5 | ||||
| -rw-r--r-- | render/gradient.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c index a3aee8be..e9fc32da 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -676,13 +676,14 @@ void menu_frame_hide(ObMenuFrame *self) void menu_frame_hide_all() { + GList *it; + if (config_submenu_show_delay) { /* remove any submenu open requests */ ob_main_loop_timeout_remove(ob_main_loop, menu_entry_frame_submenu_timeout); } - GList *it = g_list_last(menu_frame_visible); - if (it) + if ((it = g_list_last(menu_frame_visible))) menu_frame_hide(it->data); } diff --git a/render/gradient.c b/render/gradient.c index 91fe4e27..620848b0 100644 --- a/render/gradient.c +++ b/render/gradient.c @@ -371,6 +371,9 @@ static void gradient_splitvertical(RrAppearance *a, gint w, gint h) RrPixel32 current; RrColor *primary_light, *secondary_light; + VARS(y1); + VARS(y3); + r = sf->primary->r; r += r >> 2; g = sf->primary->g; @@ -393,10 +396,7 @@ static void gradient_splitvertical(RrAppearance *a, gint w, gint h) if (b > 0xFF) b = 0xFF; secondary_light = RrColorNew(a->inst, r, g, b); - VARS(y1); SETUP(y1, primary_light, sf->primary, (h / 2) -1); - - VARS(y3); SETUP(y3, sf->secondary, secondary_light, (h / 2) -1); for (y1 = h - 1; y1 > (h / 2) -1; --y1) { /* 0 -> h-1 */ |