aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Langendorf <junglerobba@jngl.one>2021-05-17 10:32:27 +0200
committerKenny Levinsen <kl@kl.wtf>2021-06-24 18:10:01 +0200
commit1766ae3f44b5d3c59d417399b152dfd6c8eba97a (patch)
tree2e42fcd40032827690acf2bffbea33d5d01d2a0b
parentd9de8d90a94d408f1af142e6a844d5309fec8e5d (diff)
remove usage of `wlr_texture_get_size`
update for wlroots 6369f7093178f0d66414eb67c312a403bfbb84a4 (cherry picked from commit 12e223e7973f7d7132d95c6302328067dec732ce)
-rw-r--r--sway/desktop/render.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 46622224..a105ffba 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -488,9 +488,10 @@ static void render_titlebar(struct sway_output *output,
int ob_marks_x = 0; // output-buffer-local
int ob_marks_width = 0; // output-buffer-local
if (config->show_marks && marks_texture) {
- struct wlr_box texture_box;
- wlr_texture_get_size(marks_texture,
- &texture_box.width, &texture_box.height);
+ struct wlr_box texture_box = {
+ .width = marks_texture->width,
+ .height = marks_texture->height,
+ };
ob_marks_width = texture_box.width;
// The marks texture might be shorter than the config->font_height, in
@@ -541,9 +542,10 @@ static void render_titlebar(struct sway_output *output,
int ob_title_x = 0; // output-buffer-local
int ob_title_width = 0; // output-buffer-local
if (title_texture) {
- struct wlr_box texture_box;
- wlr_texture_get_size(title_texture,
- &texture_box.width, &texture_box.height);
+ struct wlr_box texture_box = {
+ .width = title_texture->width,
+ .height = title_texture->height,
+ };
// The effective output may be NULL when con is not on any output.
// This can happen because we render all children of containers,