mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-09 10:07:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rcxml: sync rcxml.window_switcher with XML format

Browse source
This commit is contained in:
tokyo4j 2025-12-07 17:44:36 +09:00 • committed by Johan Malm
parent a98fd8f974
commit e2d83ff7f5
6 changed files with 39 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/cycle/cycle.c
View file

@ -257,7 +257,7 @@ preview_selected_view(struct view *view)
static struct cycle_osd_impl *
get_osd_impl(void)
{
switch (rc.window_switcher.style) {
switch (rc.window_switcher.osd.style) {
case CYCLE_OSD_STYLE_CLASSIC:
return &cycle_osd_classic_impl;
case CYCLE_OSD_STYLE_THUMBNAIL:
@ -307,9 +307,9 @@ init_cycle(struct server *server)
return false;
}
if (rc.window_switcher.show) {
if (rc.window_switcher.osd.show) {
/* Create OSD */
switch (rc.window_switcher.output_criteria) {
switch (rc.window_switcher.osd.output_criteria) {
case CYCLE_OSD_OUTPUT_ALL: {
struct output *output;
wl_list_for_each(output, &server->outputs, link) {
@ -342,7 +342,7 @@ update_cycle(struct server *server)
{
struct cycle_state *cycle = &server->cycle;
if (rc.window_switcher.show) {
if (rc.window_switcher.osd.show) {
struct output *output;
wl_list_for_each(output, &server->outputs, link) {
if (output->cycle_osd.tree) {

4
src/cycle/osd-classic.c
View file

@ -36,7 +36,7 @@ create_fields_scene(struct server *server, struct view *view,
&theme->osd_window_switcher_classic;
struct cycle_osd_field *field;
wl_list_for_each(field, &rc.window_switcher.fields, link) {
wl_list_for_each(field, &rc.window_switcher.osd.fields, link) {
int field_width = field_widths_sum * field->width / 100.0;
struct wlr_scene_node *node = NULL;
int height = -1;
@ -144,7 +144,7 @@ cycle_osd_classic_create(struct output *output)
y += switcher_theme->item_height;
}
int nr_fields = wl_list_length(&rc.window_switcher.fields);
int nr_fields = wl_list_length(&rc.window_switcher.osd.fields);
/* This is the width of the area available for text fields */
int field_widths_sum = w - 2 * padding

2
src/cycle/osd-thumbnail.c
View file

@ -103,7 +103,7 @@ create_label(struct wlr_scene_tree *parent, struct view *view,
{
struct buf buf = BUF_INIT;
cycle_osd_field_set_custom(&buf, view,
rc.window_switcher.thumbnail_label_format);
rc.window_switcher.osd.thumbnail_label_format);
struct scaled_font_buffer *buffer =
scaled_font_buffer_create(parent);
scaled_font_buffer_update(buffer, buf.data,