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

menu: vertically center-align items

Browse source
This commit is contained in:
Johan Malm 2020-10-21 20:32:08 +01:00
parent 1fae45b1f7
commit 266f625306
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/menu/menu.c
View file

@ -4,12 +4,17 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "common/font.h"
#include "labwc.h" #include "labwc.h"
#include "menu/menu.h" #include "menu/menu.h"
static float background[4] = { 0.3f, 0.1f, 0.1f, 1.0f }; static float background[4] = { 0.3f, 0.1f, 0.1f, 1.0f };
static float foreground[4] = { 1.0f, 1.0f, 1.0f, 1.0f }; static float foreground[4] = { 1.0f, 1.0f, 1.0f, 1.0f };
static const char font[] = "Sans 11"; static const char font[] = "Sans 10";
#define MENUWIDTH (100)
#define MENUHEIGHT (25)
#define MENU_PADDING_WIDTH (7)
struct wlr_texture * struct wlr_texture *
texture_create(struct server *server, struct wlr_box *geo, const char *text, texture_create(struct server *server, struct wlr_box *geo, const char *text,
@ -32,6 +37,12 @@ texture_create(struct server *server, struct wlr_box *geo, const char *text,
pango_layout_set_font_description(layout, desc); pango_layout_set_font_description(layout, desc);
pango_font_description_free(desc); pango_font_description_free(desc);
pango_cairo_update_layout(cairo, layout); pango_cairo_update_layout(cairo, layout);
/* center-align vertically */
int height;
pango_layout_get_pixel_size(layout, NULL, &height);
cairo_move_to(cairo, MENU_PADDING_WIDTH, (geo->height - height) / 2);
pango_cairo_show_layout(cairo, layout); pango_cairo_show_layout(cairo, layout);
g_object_unref(layout); g_object_unref(layout);
@ -46,9 +57,6 @@ texture_create(struct server *server, struct wlr_box *geo, const char *text,
return texture; return texture;
} }
#define MENUWIDTH (100)
#define MENUHEIGHT (25)
struct menuitem * struct menuitem *
menuitem_create(struct server *server, struct menu *menu, const char *text, menuitem_create(struct server *server, struct menu *menu, const char *text,
const char *action, const char *command) const char *action, const char *command)
@ -87,7 +95,7 @@ menu_move(struct menu *menu, int x, int y)
int offset = 0; int offset = 0;
struct menuitem *menuitem; struct menuitem *menuitem;
wl_list_for_each (menuitem, &menu->menuitems, link) { wl_list_for_each_reverse (menuitem, &menu->menuitems, link) {
menuitem->geo_box.x = menu->x; menuitem->geo_box.x = menu->x;
menuitem->geo_box.y = menu->y + offset; menuitem->geo_box.y = menu->y + offset;
offset += menuitem->geo_box.height; offset += menuitem->geo_box.height;