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

src/{common/font,theme}.c: Switch to cairo helpers

Browse source
This commit is contained in:
Consolatis 2022-08-26 04:50:54 +02:00 • committed by Johan Malm
parent 36b2a93a69
commit 127a9c7be4
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/common/font.c
View file

@ -7,6 +7,7 @@
#include <wlr/util/box.h>
#include <wlr/util/log.h>
#include "common/font.h"
#include "common/graphic-helpers.h"
#include "labwc.h"
#include "buffer.h"
@ -99,7 +100,7 @@ font_buffer_create(struct lab_data_buffer **buffer, int max_width,
cairo_t *cairo = (*buffer)->cairo;
cairo_surface_t *surf = cairo_get_target(cairo);
cairo_set_source_rgba(cairo, color[0], color[1], color[2], color[3]);
set_cairo_color(cairo, color);
cairo_move_to(cairo, 0, 0);
PangoLayout *layout = pango_cairo_create_layout(cairo);

11
src/theme.c
View file

@ -20,6 +20,7 @@
#include <strings.h>
#include "common/dir.h"
#include "common/font.h"
#include "common/graphic-helpers.h"
#include "common/string-helpers.h"
#include "common/zfree.h"
#include "config/rcxml.h"
@ -358,12 +359,6 @@ struct rounded_corner_ctx {
} corner;
};
static void
set_source(cairo_t *cairo, float *c)
{
cairo_set_source_rgba(cairo, c[0], c[1], c[2], c[3]);
}
static struct lab_data_buffer *
rounded_rect(struct rounded_corner_ctx *ctx)
{
@ -410,13 +405,13 @@ rounded_rect(struct rounded_corner_ctx *ctx)
}
cairo_close_path(cairo);
cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
set_source(cairo, ctx->fill_color);
set_cairo_color(cairo, ctx->fill_color);
cairo_fill_preserve(cairo);
cairo_stroke(cairo);
/* border */
cairo_set_line_cap(cairo, CAIRO_LINE_CAP_ROUND);
set_source(cairo, ctx->border_color);
set_cairo_color(cairo, ctx->border_color);
cairo_set_line_width(cairo, ctx->line_width);
double half_line_width = ctx->line_width / 2.0;
switch (ctx->corner) {