diff options
| author |  Tobias Langendorf <junglerobba@jngl.one> | 2021-05-17 10:32:27 +0200 |
|---|---|---|
| committer |  Simon Ser <contact@emersion.fr> | 2021-05-17 10:48:54 +0200 |
| commit | 12e223e7973f7d7132d95c6302328067dec732ce (patch) | |
| tree | 44f7b2fa02b6d9c475d5d0bca9c532dcd99ebc5c | |
| parent | view: commit transactions for foreign toplevel requests (diff) | |
| download | sway-12e223e7973f7d7132d95c6302328067dec732ce.tar.gz sway-12e223e7973f7d7132d95c6302328067dec732ce.tar.zst sway-12e223e7973f7d7132d95c6302328067dec732ce.zip | |
remove usage of `wlr_texture_get_size`
update for wlroots 6369f7093178f0d66414eb67c312a403bfbb84a4
| -rw-r--r-- | sway/desktop/render.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 4ce5654e..bf1b8666 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c | |||
| @@ -490,9 +490,10 @@ static void render_titlebar(struct sway_output *output, | |||
| 490 | int ob_marks_x = 0; // output-buffer-local | 490 | int ob_marks_x = 0; // output-buffer-local |
| 491 | int ob_marks_width = 0; // output-buffer-local | 491 | int ob_marks_width = 0; // output-buffer-local |
| 492 | if (config->show_marks && marks_texture) { | 492 | if (config->show_marks && marks_texture) { |
| 493 | struct wlr_box texture_box; | 493 | struct wlr_box texture_box = { |
| 494 | wlr_texture_get_size(marks_texture, | 494 | .width = marks_texture->width, |
| 495 | &texture_box.width, &texture_box.height); | 495 | .height = marks_texture->height, |
| 496 | }; | ||
| 496 | ob_marks_width = texture_box.width; | 497 | ob_marks_width = texture_box.width; |
| 497 | 498 | ||
| 498 | // The marks texture might be shorter than the config->font_height, in | 499 | // The marks texture might be shorter than the config->font_height, in |
| @@ -543,9 +544,10 @@ static void render_titlebar(struct sway_output *output, | |||
| 543 | int ob_title_x = 0; // output-buffer-local | 544 | int ob_title_x = 0; // output-buffer-local |
| 544 | int ob_title_width = 0; // output-buffer-local | 545 | int ob_title_width = 0; // output-buffer-local |
| 545 | if (title_texture) { | 546 | if (title_texture) { |
| 546 | struct wlr_box texture_box; | 547 | struct wlr_box texture_box = { |
| 547 | wlr_texture_get_size(title_texture, | 548 | .width = title_texture->width, |
| 548 | &texture_box.width, &texture_box.height); | 549 | .height = title_texture->height, |
| 550 | }; | ||
| 549 | 551 | ||
| 550 | // The effective output may be NULL when con is not on any output. | 552 | // The effective output may be NULL when con is not on any output. |
| 551 | // This can happen because we render all children of containers, | 553 | // This can happen because we render all children of containers, |