alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/SirCmpwn/sway

Browse source 
merging
This commit is contained in:
taiyu 2015-08-15 14:35:55 -07:00
parent 824a3d81aa 4014b215eb
commit 8752a166ed
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sway/layout.c
View file

@ -95,15 +95,28 @@ void arrange_windows(swayc_t *container, int width, int height) {
child->x = x;
child->y = y;
arrange_windows(child, -1, -1);
x += child->width;
// Removed for now because wlc works with relative positions
// Addition can be reconsidered once wlc positions are changed
// x += child->width;
}
return;
case C_OUTPUT:
container->width = width;
container->height = height;
x -= container->x;
y -= container->y;
break;
// These lines make x/y negative and result in stuff glitching out
// Their addition can be reconsidered once wlc positions are changed
// x -= container->x;
// y -= container->y;
for (i = 0; i < container->children->length; ++i) {
swayc_t *child = container->children->items[i];
sway_log(L_DEBUG, "Arranging workspace #%d", i);
child->x = x;
child->y = y;
child->width = width;
child->height = height;
arrange_windows(child, -1, -1);
}
return;
case C_VIEW:
{
struct wlc_geometry geometry = {

1
sway/main.c
View file

@ -22,6 +22,7 @@ int main(int argc, char **argv) {
sway_log(L_ERROR, "Config load failed, aborting sway post init!");
}
setenv("WLC_IDLE_TIME", "0", 0);
setenv("WLC_DIM", "0", 0);
if (!wlc_init(&interface, argc, argv)) {
return 1;