summaryrefslogtreecommitdiff
path: root/sway/container.c
diff options
context:
space:
mode:
authorDrew DeVault <[email protected]>2015-08-15 15:13:24 -0400
committerDrew DeVault <[email protected]>2015-08-15 15:13:24 -0400
commit8b90f283bc58d50288325097b3aeea617277d7a3 (patch)
tree3fe673b4372f019f9ed28e1e1c5d5ff9eb81a237 /sway/container.c
parent648675c87a3360949fdccd9947e419214fdc6ff4 (diff)
parentb97d8756a811b3a93e73629a9e12fc78cdd3acf2 (diff)
Merge pull request #31 from Luminarys/master
Multi output fixes
Diffstat (limited to 'sway/container.c')
-rw-r--r--sway/container.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/sway/container.c b/sway/container.c
index b52ffd8c..189f064b 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -47,9 +47,9 @@ swayc_t *new_output(wlc_handle handle) {
const struct wlc_size* size = wlc_output_get_resolution(handle);
swayc_t *output = new_swayc(C_OUTPUT);
- output->width = size->w;
- output->height = size->h;
- output->handle = handle;
+ output->width = size->w;
+ output->height = size->h;
+ output->handle = handle;
add_child(&root_container, output);
@@ -69,10 +69,10 @@ swayc_t *new_workspace(swayc_t * output, const char *name) {
sway_log(L_DEBUG, "Added workspace %s for output %d", name, output->handle);
swayc_t *workspace = new_swayc(C_WORKSPACE);
- workspace->layout = L_HORIZ; // TODO:default layout
- workspace->width = output->width;
- workspace->height = output->height;
- workspace->name = strdup(name);
+ workspace->layout = L_HORIZ; // TODO:default layout
+ workspace->width = output->width;
+ workspace->height = output->height;
+ workspace->name = strdup(name);
workspace->visible = true;
add_child(output, workspace);
@@ -84,12 +84,12 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) {
sway_log(L_DEBUG, "creating container %p around %p", cont, child);
- cont->layout = layout;
- cont->width = child->width;
- cont->height = child->height;
- cont->x = child->x;
- cont->y = child->y;
- cont->visible = child->visible;
+ cont->layout = layout;
+ cont->width = child->width;
+ cont->height = child->height;
+ cont->x = child->x;
+ cont->y = child->y;
+ cont->visible = child->visible;
/* Container inherits all of workspaces children, layout and whatnot */
if (child->type == C_WORKSPACE) {
@@ -131,8 +131,8 @@ swayc_t *new_view(swayc_t *sibling, wlc_handle handle) {
sway_log(L_DEBUG, "Adding new view %d:%s:%d to container %p %d",
handle, title, type, sibling, sibling?sibling->type:0);
//Setup values
- view->handle = handle;
- view->name = strdup(title);
+ view->handle = handle;
+ view->name = strdup(title);
view->visible = true;
//Case of focused workspace, just create as child of it