From 07dd2c6442b97c8df0dee6076dc45eb310916bcf Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 20 Mar 2004 23:40:29 +0000 Subject: [PATCH] fix reversed variable name and add a little comment to the magic menu code --- openbox/client.c | 2 +- openbox/config.c | 6 +++--- openbox/menuframe.c | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/openbox/client.c b/openbox/client.c index a5690877..05cf9acd 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -2116,7 +2116,7 @@ void client_configure_full(ObClient *self, ObCorner anchor, resizing in redraw mode */ send_resize_client = ((!user && resized) || (user && (final || - (resized && config_redraw_resize)))); + (resized && config_resize_redraw)))); /* if the client is enlarging, the resize the client before the frame */ if (send_resize_client && user && (w > oldw || h > oldh)) diff --git a/openbox/config.c b/openbox/config.c index 49105411..c5c1aeb9 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -40,7 +40,7 @@ gint config_desktops_num; GSList *config_desktops_names; gint config_screen_firstdesk; -gboolean config_redraw_resize; +gboolean config_resize_redraw; ObStackingLayer config_dock_layer; gboolean config_dock_floating; @@ -291,7 +291,7 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, node = node->children; if ((n = parse_find_node("drawContents", node))) - config_redraw_resize = parse_bool(doc, n); + config_resize_redraw = parse_bool(doc, n); } static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, @@ -530,7 +530,7 @@ void config_startup(ObParseInst *i) parse_register(i, "desktops", parse_desktops, NULL); - config_redraw_resize = TRUE; + config_resize_redraw = TRUE; parse_register(i, "resize", parse_resize, NULL); diff --git a/openbox/menuframe.c b/openbox/menuframe.c index a0547935..5a18c51c 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -217,9 +217,11 @@ void menu_frame_move_on_screen(ObMenuFrame *self) if (dx || dy) { ObMenuFrame *f; + /* move the current menu frame to fit, but dont touch parents yet */ menu_frame_move(self, self->area.x + dx, self->area.y + dy); if (!config_menu_xorstyle) - dy = 0; + dy = 0; /* if we want to be like xor, move parents in y- * + * and x-direction, otherwise just in x-dir */ for (f = self->parent; f; f = f->parent) menu_frame_move(f, f->area.x + dx, f->area.y + dy); for (f = self->child; f; f = f->child) -- 2.39.2