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

Make font_texture_create() more generic

Browse source 
Move font_texture_create() to font.c so it can be used for purposes other
than rendering the menu, for example server side decoration.

Refactor menu.c and menu.h to use this more generic font_texture_create()
This commit is contained in:
Johan Malm 2021-08-07 08:35:46 +01:00
parent 8fc6f795db
commit 5ecf0e1e7e
5 changed files with 104 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/output.c
View file

@ -544,13 +544,13 @@ render_rootmenu(struct output *output, pixman_region32_t *output_damage)
struct menuitem *menuitem;
wl_list_for_each (menuitem, &server->rootmenu->menuitems, link) {
struct wlr_texture *t;
t = menuitem->selected ? menuitem->active_texture :
menuitem->inactive_texture;
t = menuitem->selected ? menuitem->texture.active :
menuitem->texture.inactive;
struct wlr_box box = {
.x = menuitem->geo_box.x + ox,
.y = menuitem->geo_box.y + oy,
.width = menuitem->geo_box.width,
.height = menuitem->geo_box.height,
.x = menuitem->box.x + ox + menuitem->texture.offset_x,
.y = menuitem->box.y + oy + menuitem->texture.offset_y,
.width = t->width,
.height = t->height,
};
scale_box(&box, output->wlr_output->scale);
wlr_matrix_project_box(matrix, &box, WL_OUTPUT_TRANSFORM_NORMAL,