diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-19 23:59:40 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-19 23:59:40 -0500 |
| commit | 3ae58f457bcdfa90b26dad4c9d192f045874ddae (patch) | |
| tree | 23d603a47cfedc8e51cf36bf3480f83118b94710 /openbox/actions/resize.c | |
| parent | 2b8b5da04b14af1639143cc332874c7e1a03a8bb (diff) | |
| parent | 4b41ac8343efa21a959d81a4db8aea32e5960f10 (diff) | |
Merge branch 'backport'
Diffstat (limited to 'openbox/actions/resize.c')
| -rw-r--r-- | openbox/actions/resize.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/openbox/actions/resize.c b/openbox/actions/resize.c index 81901bdd..3714e38b 100644 --- a/openbox/actions/resize.c +++ b/openbox/actions/resize.c @@ -5,6 +5,7 @@ #include "openbox/frame.h" typedef struct { + gboolean corner_specified; guint32 corner; } Options; @@ -33,6 +34,8 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) if ((n = parse_find_node("edge", node))) { gchar *s = parse_string(doc, n); + + o->corner_specified = TRUE; if (!g_ascii_strcasecmp(s, "top")) o->corner = prop_atoms.net_wm_moveresize_size_top; 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; else if (!g_ascii_strcasecmp(s, "bottomright")) o->corner = prop_atoms.net_wm_moveresize_size_bottomright; + else + o->corner_specified = FALSE; + g_free(s); } return o; @@ -72,7 +78,7 @@ static gboolean run_func(ObActionsData *data, gpointer options) if (!data->button) 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 */ else corner = pick_corner(data->x, data->y, |