mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-07 04:07:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Base rc.title_height on font vertical extents

Browse source
This commit is contained in:
Johan Malm 2020-08-05 20:14:17 +01:00
parent 4d1363dcae
commit 2297e43cc0
11 changed files with 123 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/common/font.c Normal file
View file

@ -0,0 +1,41 @@
#include <cairo.h>
#include <pango/pangocairo.h>
#include "common/font.h"
static PangoRectangle font_extents(const char *font_description,
const char *string)
{
PangoRectangle rect;
cairo_surface_t *surface;
cairo_t *c;
PangoLayout *layout;
PangoFontDescription *font;
surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1);
c = cairo_create(surface);
layout = pango_cairo_create_layout(c);
font = pango_font_description_from_string(font_description);
pango_layout_set_font_description(layout, font);
pango_layout_set_text(layout, string, -1);
pango_layout_set_single_paragraph_mode(layout, TRUE);
pango_layout_set_width(layout, -1);
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_MIDDLE);
pango_layout_get_extents(layout, NULL, &rect);
pango_extents_to_pixels(&rect, NULL);
/* we put a 2 px edge on each side - because Openbox does it :) */
rect.width += 4;
g_object_unref(layout);
pango_font_description_free(font);
return rect;
}
int font_height(const char *font_description)
{
PangoRectangle rectangle;
rectangle = font_extents(font_description, "abcdefg");
return rectangle.height;
}

1
src/common/meson.build
View file

@ -1,4 +1,5 @@
labwc_sources += files(
'buf.c',
'font.c',
'spawn.c',
)

11
src/config/rcxml.c
View file

@ -14,6 +14,7 @@
#include "config/keybind.h"
#include "config/config-dir.h"
#include "common/bug-on.h"
#include "common/font.h"
static bool in_keybind = false;
static bool is_attribute = false;
@ -232,6 +233,14 @@ static void bind(const char *binding, const char *action)
fprintf(stderr, "binding: %s: %s\n", binding, action);
}
static void set_title_height(void)
{
char buf[256];
snprintf(buf, sizeof(buf), "%s %d", rc.font_name_activewindow,
rc.font_size_activewindow);
rc.title_height = font_height(buf);
}
static void post_processing(void)
{
if (!wl_list_length(&rc.keybinds)) {
@ -241,6 +250,8 @@ static void post_processing(void)
bind("A-F3", "Execute");
}
/* TODO: Set all char* variables if NULL */
set_title_height();
}
static void rcxml_path(char *buf, size_t len, const char *filename)

38
src/deco.c
View file

@ -6,18 +6,18 @@
#include "labwc.h"
#include "theme/theme.h"
#include "config/rcxml.h"
/* Based on expected font height of Sans 8 */
#define TITLE_HEIGHT (14)
#define BORDER_WIDTH (1)
struct wlr_box deco_max_extents(struct view *view)
{
struct wlr_box box = {
.x = view->x - BORDER_WIDTH,
.y = view->y - TITLE_HEIGHT - BORDER_WIDTH,
.y = view->y - rc.title_height - BORDER_WIDTH,
.width = view->surface->current.width + 2 * BORDER_WIDTH,
.height = view->surface->current.height + TITLE_HEIGHT +
.height = view->surface->current.height + rc.title_height +
2 * BORDER_WIDTH,
};
return box;
@ -33,44 +33,44 @@ struct wlr_box deco_box(struct view *view, enum deco_part deco_part)
switch (deco_part) {
case LAB_DECO_BUTTON_CLOSE:
wlr_texture_get_size(theme.xbm_close, &box.width, &box.height);
margin = (TITLE_HEIGHT - box.height) / 2;
margin = (rc.title_height - box.height) / 2;
box.x = view->x + view->surface->current.width + margin -
TITLE_HEIGHT;
box.y = view->y - TITLE_HEIGHT + margin;
rc.title_height;
box.y = view->y - rc.title_height + margin;
break;
case LAB_DECO_BUTTON_MAXIMIZE:
wlr_texture_get_size(theme.xbm_maximize, &box.width,
&box.height);
margin = (TITLE_HEIGHT - box.height) / 2;
margin = (rc.title_height - box.height) / 2;
box.x = view->x + view->surface->current.width + margin -
TITLE_HEIGHT * 2;
box.y = view->y - TITLE_HEIGHT + margin;
rc.title_height * 2;
box.y = view->y - rc.title_height + margin;
break;
case LAB_DECO_BUTTON_ICONIFY:
wlr_texture_get_size(theme.xbm_iconify, &box.width,
&box.height);
margin = (TITLE_HEIGHT - box.height) / 2;
margin = (rc.title_height - box.height) / 2;
box.x = view->x + view->surface->current.width + margin -
TITLE_HEIGHT * 3;
box.y = view->y - TITLE_HEIGHT + margin;
rc.title_height * 3;
box.y = view->y - rc.title_height + margin;
break;
case LAB_DECO_PART_TITLE:
box.x = view->x;
box.y = view->y - TITLE_HEIGHT;
box.y = view->y - rc.title_height;
box.width = view->surface->current.width;
box.height = TITLE_HEIGHT;
box.height = rc.title_height;
break;
case LAB_DECO_PART_TOP:
box.x = view->x - BORDER_WIDTH;
box.y = view->y - TITLE_HEIGHT - BORDER_WIDTH;
box.y = view->y - rc.title_height - BORDER_WIDTH;
box.width = view->surface->current.width + 2 * BORDER_WIDTH;
box.height = BORDER_WIDTH;
break;
case LAB_DECO_PART_RIGHT:
box.x = view->x + view->surface->current.width;
box.y = view->y - TITLE_HEIGHT;
box.y = view->y - rc.title_height;
box.width = BORDER_WIDTH;
box.height = view->surface->current.height + TITLE_HEIGHT;
box.height = view->surface->current.height + rc.title_height;
break;
case LAB_DECO_PART_BOTTOM:
box.x = view->x - BORDER_WIDTH;
@ -80,9 +80,9 @@ struct wlr_box deco_box(struct view *view, enum deco_part deco_part)
break;
case LAB_DECO_PART_LEFT:
box.x = view->x - BORDER_WIDTH;
box.y = view->y - TITLE_HEIGHT;
box.y = view->y - rc.title_height;
box.width = BORDER_WIDTH;
box.height = view->surface->current.height + TITLE_HEIGHT;
box.height = view->surface->current.height + rc.title_height;
break;
default:
break;