merge r7699 from 3.4-working, (let per-app settings override program specified position but not user specified)
This commit is contained in:
parent
f39cc88fc4
commit
4193404acf
1 changed files with 5 additions and 1 deletions
|
@ -473,7 +473,11 @@ gboolean place_client(ObClient *client, gint *x, gint *y,
|
||||||
{
|
{
|
||||||
gboolean ret;
|
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;
|
return FALSE;
|
||||||
|
|
||||||
/* try a number of methods */
|
/* try a number of methods */
|
||||||
|
|
Loading…
Reference in a new issue