summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2007-04-24 12:18:53 +0000
committerMikael Magnusson <mikachu@comhem.se>2007-04-24 12:18:53 +0000
commite86900bd531d9c7093f8f5f6329e89c80bfe9767 (patch)
tree8c5b4f1844c3eb057b6a2a81fcff77169b4a531a /openbox
parent7854818a822893edeb9ed41397f1041cf466825a (diff)
fix resizing when drawContents is off, and I think an ifdef was a bit too high up
Diffstat (limited to 'openbox')
-rw-r--r--openbox/client.c2
-rw-r--r--openbox/moveresize.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/openbox/client.c b/openbox/client.c
index d5e7f4ce..f5eccbc0 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1306,7 +1306,7 @@ void client_update_protocols(ObClient *self)
self->focus_notify = TRUE;
#ifdef SYNC
else if (proto[i] == prop_atoms.net_wm_sync_request)
- /* if this protocol is requested, then the resizing the
+ /* if this protocol is requested, then resizing the
window will be synchronized between the frame and the
client */
self->sync_request = TRUE;
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 39fdd45d..c34cf81b 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -174,8 +174,8 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
g_assert_not_reached();
#ifdef SYNC
- if (!moving && extensions_shape && moveresize_client->sync_request &&
- moveresize_client->sync_counter)
+ if (config_resize_redraw && !moving && extensions_shape &&
+ moveresize_client->sync_request && moveresize_client->sync_counter)
{
/* Initialize values for the resize syncing, and create an alarm for
the client's xsync counter */
@@ -269,7 +269,6 @@ static void do_move(gboolean resist)
static void do_resize()
{
-#ifdef SYNC
gint x, y, w, h, lw, lh;
/* see if it is actually going to resize */
@@ -285,8 +284,9 @@ static void do_resize()
return;
}
- if (extensions_sync && moveresize_client->sync_request &&
- moveresize_client->sync_counter)
+#ifdef SYNC
+ if (config_resize_redraw && extensions_sync &&
+ moveresize_client->sync_request && moveresize_client->sync_counter)
{
XEvent ce;
XSyncValue val;