diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-07 02:06:42 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-07 02:06:42 -0500 |
| commit | 5f04ca85ef6a2ebc2d66842e261a676691e9b4de (patch) | |
| tree | 5d28851a47a36a7130426644573f0fe1b1a6b5e8 /openbox/place.c | |
| parent | 4435c3a438f092252f563d5fd97dffd440a164db (diff) | |
| parent | 307befd333dd89a990e541c37c8c3717e125dcdf (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/config.c
Diffstat (limited to 'openbox/place.c')
| -rw-r--r-- | openbox/place.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openbox/place.c b/openbox/place.c index 9e38bdef..aac40e8a 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -489,8 +489,9 @@ gboolean place_client(ObClient *client, gint *x, gint *y, gboolean userplaced = FALSE; /* per-app settings override program specified position - * but not user specified */ - if ((client->positioned & USPosition) || + * but not user specified, unless pos_force is enabled */ + if (((client->positioned & USPosition) && + !(settings && settings->pos_given && settings->pos_force)) || ((client->positioned & PPosition) && !(settings && settings->pos_given))) return FALSE; |