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

osd: generalize osd_{classic,thumbnail}_item

Browse source 
This allows us to share common codes for dealing with osd items.
For example:
- Get the clicked osd item to focus its associated window
- Scroll the items when their total height is taller than output height
This commit is contained in:
tokyo4j 2025-10-30 02:51:05 +09:00 • committed by Johan Malm
parent 747163fa3e
commit 00f0a46ef7
6 changed files with 43 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/osd/osd-classic.c
View file

@ -8,9 +8,11 @@
#include "common/buf.h"
#include "common/font.h"
#include "common/lab-scene-rect.h"
#include "common/list.h"
#include "common/string-helpers.h"
#include "config/rcxml.h"
#include "labwc.h"
#include "node.h"
#include "osd.h"
#include "output.h"
#include "scaled-buffer/scaled-font-buffer.h"
@ -19,7 +21,7 @@
#include "workspaces.h"
struct osd_classic_item {
struct view *view;
struct osd_item base;
struct wlr_scene_tree *normal_tree, *active_tree;
};
@ -76,7 +78,7 @@ create_fields_scene(struct server *server, struct view *view,
static void
osd_classic_create(struct output *output, struct wl_array *views)
{
assert(!output->osd_scene.tree);
assert(!output->osd_scene.tree && wl_list_empty(&output->osd_scene.items));
struct server *server = output->server;
struct theme *theme = server->theme;
@ -155,9 +157,10 @@ osd_classic_create(struct output *output, struct wl_array *views)
/* Draw text for each node */
struct view **view;
wl_array_for_each(view, views) {
struct osd_classic_item *item =
wl_array_add(&output->osd_scene.items, sizeof(*item));
item->view = *view;
struct osd_classic_item *item = znew(*item);
wl_list_append(&output->osd_scene.items, &item->base.link);
item->base.view = *view;
item->base.tree = wlr_scene_tree_create(output->osd_scene.tree);
/*
* OSD border
* +---------------------------------+
@ -177,10 +180,8 @@ osd_classic_create(struct output *output, struct wl_array *views)
int x = padding
+ switcher_theme->item_active_border_width
+ switcher_theme->item_padding_x;
struct wlr_scene_tree *item_root =
wlr_scene_tree_create(output->osd_scene.tree);
item->normal_tree = wlr_scene_tree_create(item_root);
item->active_tree = wlr_scene_tree_create(item_root);
item->normal_tree = wlr_scene_tree_create(item->base.tree);
item->active_tree = wlr_scene_tree_create(item->base.tree);
wlr_scene_node_set_enabled(&item->active_tree->node, false);
float *active_bg_color = switcher_theme->item_active_bg_color;
@ -219,8 +220,8 @@ static void
osd_classic_update(struct output *output)
{
struct osd_classic_item *item;
wl_array_for_each(item, &output->osd_scene.items) {
bool active = item->view == output->server->osd_state.cycle_view;
wl_list_for_each(item, &output->osd_scene.items, base.link) {
bool active = item->base.view == output->server->osd_state.cycle_view;
wlr_scene_node_set_enabled(&item->normal_tree->node, !active);
wlr_scene_node_set_enabled(&item->active_tree->node, active);
}