diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2007-07-11 00:39:14 +0000 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2007-07-11 00:39:14 +0000 |
| commit | 4193404acf45ce591ac2ee0b7a27a5bf52b4b4c6 (patch) | |
| tree | f83ec3fbe7cfab6391cd65ab953151543f21b543 | |
| parent | f39cc88fc4899119c51c239e1768b727f1e0ae20 (diff) | |
merge r7699 from 3.4-working, (let per-app settings override program specified position but not user specified)
| -rw-r--r-- | openbox/place.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/openbox/place.c b/openbox/place.c index 6a210b0f..d290be3d 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -473,7 +473,11 @@ gboolean place_client(ObClient *client, gint *x, gint *y, { gboolean ret; - if (client->positioned) + /* per-app settings override program specified position + * but not user specified */ + if ((client->positioned & USPosition) || + ((client->positioned & PPosition) && !(settings && settings->pos_given)) + ) return FALSE; /* try a number of methods */ |