summaryrefslogtreecommitdiff
path: root/clients
diff options
context:
space:
mode:
authorQuentin Glidic <sardemff7+git@sardemff7.net>2016-06-23 18:55:23 +0200
committerDaniel Stone <daniels@collabora.com>2016-11-21 18:18:00 +0000
commit51c2c37e0e5bb543f670ee55730ad3edc0861095 (patch)
treeb27e0db50fd9c4fb6fab93a2bcf088a856f9774e /clients
parent3e37b343a2da111957fdb2cb1a19686be7ab2c27 (diff)
desktop-shell/client: Introduce helper variables
These variables will be much more useful in the following commit. The indentation is off to avoid future diff noise. Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> Reviewed-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to 'clients')
-rw-r--r--clients/desktop-shell.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
index 77213eda..49257c2c 100644
--- a/clients/desktop-shell.c
+++ b/clients/desktop-shell.c
@@ -470,16 +470,20 @@ panel_resize_handler(struct widget *widget,
{
struct panel_launcher *launcher;
struct panel *panel = data;
- int x, y, w, h;
+ int by = height / 2;
+ int spacing = 10;
+ int x = spacing;
+ int y = spacing;
+ int w, h;
- x = 10;
- y = 16;
wl_list_for_each(launcher, &panel->launcher_list, link) {
w = cairo_image_surface_get_width(launcher->icon);
h = cairo_image_surface_get_height(launcher->icon);
+
+ y = by - h / 2;
widget_set_allocation(launcher->widget,
- x, y - h / 2, w + 1, h + 1);
- x += w + 10;
+ x, y, w + 1, h + 1);
+ x += w + spacing;
}
h = 20;
@@ -489,9 +493,12 @@ panel_resize_handler(struct widget *widget,
else /* CLOCK_FORMAT_MINUTES */
w = 170;
+ x = width - w - spacing;
+ y = by - h / 2;
+
if (panel->clock)
widget_set_allocation(panel->clock->widget,
- width - w - 8, y - h / 2, w + 1, h + 1);
+ x, y, w + 1, h + 1);
}
static void
@@ -503,7 +510,8 @@ panel_configure(void *data,
struct surface *surface = window_get_user_data(window);
struct panel *panel = container_of(surface, struct panel, base);
- window_schedule_resize(panel->window, width, 32);
+ height = 32;
+ window_schedule_resize(panel->window, width, height);
}
static void