mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-05 13:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

theme: move title_height to theme struct

Browse source 
title_height is a derived variable which needs both config and theme
variables (font height and title padding). The code is tidier calling
post_processing() for this from theme_init()
This commit is contained in:
Johan Malm 2021-04-15 20:13:49 +01:00
parent 85c775c3b1
commit 2f5a44d34d
5 changed files with 46 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/ssd.c
View file

@ -18,7 +18,7 @@ ssd_thickness(struct view *view)
{
struct theme *theme = view->server->theme;
struct border border = {
.top = rc.title_height + theme->border_width,
.top = theme->title_height + theme->border_width,
.bottom = theme->border_width,
.left = theme->border_width,
.right = theme->border_width,
@ -44,37 +44,37 @@ ssd_box(struct view *view, enum ssd_part_type type)
{
struct theme *theme = view->server->theme;
struct wlr_box box = { 0 };
int corner_square = rc.title_height + theme->border_width;
int corner_square = theme->title_height + theme->border_width;
assert(view);
switch (type) {
case LAB_SSD_BUTTON_CLOSE:
box.x = view->x + view->w - rc.title_height;
box.y = view->y - rc.title_height;
box.width = rc.title_height;
box.height = rc.title_height;
box.x = view->x + view->w - theme->title_height;
box.y = view->y - theme->title_height;
box.width = theme->title_height;
box.height = theme->title_height;
break;
case LAB_SSD_BUTTON_MAXIMIZE:
box.x = view->x + view->w - rc.title_height * 2;
box.y = view->y - rc.title_height;
box.width = rc.title_height;
box.height = rc.title_height;
box.x = view->x + view->w - theme->title_height * 2;
box.y = view->y - theme->title_height;
box.width = theme->title_height;
box.height = theme->title_height;
break;
case LAB_SSD_BUTTON_ICONIFY:
box.x = view->x + view->w - rc.title_height * 3;
box.y = view->y - rc.title_height;
box.width = rc.title_height;
box.height = rc.title_height;
box.x = view->x + view->w - theme->title_height * 3;
box.y = view->y - theme->title_height;
box.width = theme->title_height;
box.height = theme->title_height;
break;
case LAB_SSD_PART_TITLE:
box.x = view->x + rc.title_height;
box.y = view->y - rc.title_height;
box.width = view->w - 2 * rc.title_height;
box.height = rc.title_height;
box.x = view->x + theme->title_height;
box.y = view->y - theme->title_height;
box.width = view->w - 2 * theme->title_height;
box.height = theme->title_height;
break;
case LAB_SSD_PART_TOP:
box.x = view->x + rc.title_height;
box.x = view->x + theme->title_height;
box.y = view->y - corner_square;
box.width = view->w - 2 * rc.title_height;
box.width = view->w - 2 * theme->title_height;
box.height = theme->border_width;
break;
case LAB_SSD_PART_RIGHT:
@ -102,7 +102,7 @@ ssd_box(struct view *view, enum ssd_part_type type)
box.height = corner_square;
break;
case LAB_SSD_PART_CORNER_TOP_RIGHT:
box.x = view->x + view->w - rc.title_height;
box.x = view->x + view->w - theme->title_height;
box.y = view->y - corner_square;
box.width = corner_square;
box.height = corner_square;