nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resizing was defaulting to the topleft corner instead of to the auto-ness or something..

Browse source
This commit is contained in:
Dana Jansens 2008-01-15 19:54:30 -05:00 committed by Mikael Magnusson
parent ed51baa958
commit 26f34d3ba0
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
openbox/actions/resize.c
View file

@ -5,6 +5,7 @@
#include "openbox/frame.h" #include "openbox/frame.h"
typedef struct { typedef struct {
gboolean corner_specified;
guint32 corner; guint32 corner;
} Options; } Options;
@ -33,6 +34,8 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
if ((n = parse_find_node("edge", node))) { if ((n = parse_find_node("edge", node))) {
gchar *s = parse_string(doc, n); gchar *s = parse_string(doc, n);
o->corner_specified = TRUE;
if (!g_ascii_strcasecmp(s, "top")) if (!g_ascii_strcasecmp(s, "top"))
o->corner = prop_atoms.net_wm_moveresize_size_top; o->corner = prop_atoms.net_wm_moveresize_size_top;
else if (!g_ascii_strcasecmp(s, "bottom")) else if (!g_ascii_strcasecmp(s, "bottom"))
@ -49,6 +52,9 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
o->corner = prop_atoms.net_wm_moveresize_size_bottomleft; o->corner = prop_atoms.net_wm_moveresize_size_bottomleft;
else if (!g_ascii_strcasecmp(s, "bottomright")) else if (!g_ascii_strcasecmp(s, "bottomright"))
o->corner = prop_atoms.net_wm_moveresize_size_bottomright; o->corner = prop_atoms.net_wm_moveresize_size_bottomright;
else
o->corner_specified = FALSE;
g_free(s); g_free(s);
} }
return o; return o;
@ -72,7 +78,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
if (!data->button) if (!data->button)
corner = prop_atoms.net_wm_moveresize_size_keyboard; corner = prop_atoms.net_wm_moveresize_size_keyboard;
else if (o->corner) else if (o->corner_specified)
corner = o->corner; /* it was specified in the binding */ corner = o->corner; /* it was specified in the binding */
else else
corner = pick_corner(data->x, data->y, corner = pick_corner(data->x, data->y,