godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into bacardi55

Browse Source
This commit is contained in:
Raphael Khaiat 2011-01-03 21:40:27 +01:00
commit 1460229397
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/layout.c
View File

@ -325,10 +325,7 @@ multi_tile(int screen, Position type)
{
if(type == Top)
mastergeo.y = (n <= nmaster) ? (uint)sg.y : sg.y + (sg.height - mwfact) - BORDH;
if (nmaster != 0)
mastergeo.width = (sg.width / nmaster) - (BORDH * 4);
else
mastergeo.width = sg.width - (BORDH * 4);
mastergeo.width = (sg.width / nmaster) - (BORDH * 4);
mastergeo.height = (n <= nmaster) ? (uint)(sg.height - BORDH) : mwfact;
}
else
@ -336,10 +333,7 @@ multi_tile(int screen, Position type)
if(type == Left)
mastergeo.x = (n <= nmaster) ? (uint)sg.x : (sg.x + sg.width) - mwfact - (BORDH * 2);
mastergeo.width = (n <= nmaster) ? (uint)(sg.width - (BORDH * 2)) : mwfact;
if (nmaster != 0)
mastergeo.height = sg.height - BORDH;
else
mastergeo.height = BORDH;
mastergeo.height = (sg.height / nmaster) - BORDH;
}
/* TILED SIZE */

17
src/tag.c
View File

@ -47,8 +47,12 @@ tag_set(int tag)
screen_get_sel();
if(seltag[selscreen] != tag)
if(seltag[selscreen] != tag && prevseltag[selscreen] != tag)
prevseltag[selscreen] = seltag[selscreen];
else if(tag == seltag[selscreen] && tag != prevseltag[selscreen])
tag = seltag[selscreen] = prevseltag[selscreen];
else
seltag[selscreen] = tag;
if(conf.tag_round)
{
@ -61,20 +65,17 @@ tag_set(int tag)
}
else
{
if(!tag || (tag == seltag[selscreen] && tag == prevseltag[selscreen])
|| tag > conf.ntag[selscreen])
if(!tag || tag > conf.ntag[selscreen])
return;
if(tag == seltag[selscreen] && tag != prevseltag[selscreen])
tag = seltag[selscreen] = prevseltag[selscreen];
else
seltag[selscreen] = tag;
seltag[selscreen] = tag;
}
ewmh_update_current_tag_prop();
/* Arrange infobar position */
if(tags[selscreen][prevseltag[selscreen]].barpos != tags[selscreen][seltag[selscreen]].barpos)
if(tags[selscreen][prevseltag[selscreen]].barpos != tags[selscreen][seltag[selscreen]].barpos
|| prevseltag[selscreen] == seltag[selscreen])
infobar_set_position(tags[selscreen][seltag[selscreen]].barpos);
/* Check if a layout update is needed with additional tags */