aboutsummaryrefslogtreecommitdiff
path: root/sway/layout.c
diff options
context:
space:
mode:
authorD.B <thejan.2009@gmail.com>2016-07-21 22:13:31 +0200
committerD.B <thejan.2009@gmail.com>2016-07-21 22:21:49 +0200
commit03b0180c302b1f6feeecd39fd76f84f7a99abf34 (patch)
treeda08882e578e55e1a39e2f20ad359330ad20fe7d /sway/layout.c
parentb893f07ce19c999f7358c39bf8019c7df984248b (diff)
rename ws to workspace for clarity
Diffstat (limited to 'sway/layout.c')
-rw-r--r--sway/layout.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sway/layout.c b/sway/layout.c
index 80c74c16..3285560b 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -522,8 +522,8 @@ void update_geometry(swayc_t *container) {
return;
}
- swayc_t *ws = swayc_parent_by_type(container, C_WORKSPACE);
- swayc_t *op = ws->parent;
+ swayc_t *workspace = swayc_parent_by_type(container, C_WORKSPACE);
+ swayc_t *op = workspace->parent;
swayc_t *parent = container->parent;
struct wlc_geometry geometry = {
@@ -552,7 +552,7 @@ void update_geometry(swayc_t *container) {
geometry.origin.y = 0;
geometry.size.w = size->w;
geometry.size.h = size->h;
- if (op->focused == ws) {
+ if (op->focused == workspace) {
wlc_view_bring_to_front(container->handle);
}
@@ -570,23 +570,23 @@ void update_geometry(swayc_t *container) {
int border_right = container->border_thickness;
// handle hide_edge_borders
- if (config->hide_edge_borders != E_NONE && (gap <= 0 || (config->smart_gaps && ws->children->length == 1))) {
+ if (config->hide_edge_borders != E_NONE && (gap <= 0 || (config->smart_gaps && workspace->children->length == 1))) {
if (config->hide_edge_borders == E_HORIZONTAL || config->hide_edge_borders == E_BOTH) {
- if (geometry.origin.x == ws->x) {
+ if (geometry.origin.x == workspace->x) {
border_left = 0;
}
- if (geometry.origin.x + geometry.size.w == ws->width) {
+ if (geometry.origin.x + geometry.size.w == workspace->width) {
border_right = 0;
}
}
if (config->hide_edge_borders == E_VERTICAL || config->hide_edge_borders == E_BOTH) {
- if (geometry.origin.y == ws->y) {
+ if (geometry.origin.y == workspace->y) {
border_top = 0;
}
- if (geometry.origin.y + geometry.size.h == ws->height) {
+ if (geometry.origin.y + geometry.size.h == workspace->height) {
border_bottom = 0;
}
}