mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-24 08:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

sway_text_node: Consider all output scales when calculating buffer size

Browse source
This commit is contained in:
Alexander Orzechowski 2024-11-03 16:24:37 -05:00
parent d417a8fcd0
commit a81953cb3e
2 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/sway_text_node.h
View file

@ -6,7 +6,7 @@ struct sway_text_node {
int width; int width;
int max_width; int max_width;
int height; int height;
int baseline; float baseline;
bool pango_markup; bool pango_markup;
float color[4]; float color[4];
float background[4]; float background[4];

53
sway/sway_text_node.c
View file

@ -9,6 +9,7 @@
#include "pango.h" #include "pango.h"
#include "sway/config.h" #include "sway/config.h"
#include "sway/sway_text_node.h" #include "sway/sway_text_node.h"
#include "sway/output.h"
struct cairo_buffer { struct cairo_buffer {
struct wlr_buffer base; struct wlr_buffer base;
@ -163,6 +164,39 @@ err:
cairo_font_options_destroy(fo); cairo_font_options_destroy(fo);
} }
static void text_calc_size(struct text_buffer *buffer) {
struct sway_text_node *props = &buffer->props;
props->width = 0;
cairo_t *c = cairo_create(NULL);
if (!c) {
sway_log(SWAY_ERROR, "cairo_t allocation failed");
return;
}
cairo_set_antialias(c, CAIRO_ANTIALIAS_BEST);
for (int i = 0; i < root->outputs->length; ++i) {
struct sway_output *output = root->outputs->items[i];
if (!output->wlr_output->enabled) {
continue;
}
int size, baseline;
get_text_size(c, config->font_description, &size, NULL,
&baseline, output->wlr_output->scale, props->pango_markup, "%s", buffer->text);
size = ceil((float)size / output->wlr_output->scale);
if (props->width < size) {
props->width = size;
props->baseline = (float)baseline / output->wlr_output->scale;
}
}
cairo_destroy(c);
wlr_scene_buffer_set_dest_size(buffer->buffer_node,
get_text_width(props), props->height);
}
static void handle_outputs_update(struct wl_listener *listener, void *data) { static void handle_outputs_update(struct wl_listener *listener, void *data) {
struct text_buffer *buffer = wl_container_of(listener, buffer, outputs_update); struct text_buffer *buffer = wl_container_of(listener, buffer, outputs_update);
struct wlr_scene_outputs_update_event *event = data; struct wlr_scene_outputs_update_event *event = data;
@ -194,6 +228,7 @@ static void handle_outputs_update(struct wl_listener *listener, void *data) {
if (scale != buffer->scale || subpixel != buffer->subpixel) { if (scale != buffer->scale || subpixel != buffer->subpixel) {
buffer->scale = scale; buffer->scale = scale;
buffer->subpixel = subpixel; buffer->subpixel = subpixel;
text_calc_size(buffer);
render_backing_buffer(buffer); render_backing_buffer(buffer);
} }
} }
@ -208,24 +243,6 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
free(buffer); free(buffer);
} }
static void text_calc_size(struct text_buffer *buffer) {
struct sway_text_node *props = &buffer->props;
cairo_t *c = cairo_create(NULL);
if (!c) {
sway_log(SWAY_ERROR, "cairo_t allocation failed");
return;
}
cairo_set_antialias(c, CAIRO_ANTIALIAS_BEST);
get_text_size(c, config->font_description, &props->width, NULL,
&props->baseline, 1, props->pango_markup, "%s", buffer->text);
cairo_destroy(c);
wlr_scene_buffer_set_dest_size(buffer->buffer_node,
get_text_width(props), props->height);
}
struct sway_text_node *sway_text_node_create(struct wlr_scene_tree *parent, struct sway_text_node *sway_text_node_create(struct wlr_scene_tree *parent,
char *text, float color[4], bool pango_markup) { char *text, float color[4], bool pango_markup) {
struct text_buffer *buffer = calloc(1, sizeof(*buffer)); struct text_buffer *buffer = calloc(1, sizeof(*buffer));