rcxml: move <maximizedDecoration> from <core> to <theme>

This commit is contained in:
tokyo4j 2025-10-09 21:24:44 +09:00 committed by Johan Malm
parent e1820adcd3
commit 6cdfe32af0
3 changed files with 12 additions and 13 deletions

View file

@ -171,7 +171,6 @@ this is for compatibility with Openbox.
``` ```
<core> <core>
<decoration>server</decoration> <decoration>server</decoration>
<maximizedDecoration>titlebar</maximizedDecoration>
<gap>0</gap> <gap>0</gap>
<adaptiveSync>no</adaptiveSync> <adaptiveSync>no</adaptiveSync>
<allowTearing>no</allowTearing> <allowTearing>no</allowTearing>
@ -188,11 +187,6 @@ this is for compatibility with Openbox.
that it is not always possible to turn off client side decorations. that it is not always possible to turn off client side decorations.
Default is server. Default is server.
*<core><maximizedDecoration>* [titlebar|none]
Specify how server side decorations are shown for maximized windows.
*titlebar* shows titlebar above a maximized window. *none* shows no server
side decorations around a maximized window. Default is titlebar.
*<core><gap>* *<core><gap>*
The distance in pixels between windows and output edges when using The distance in pixels between windows and output edges when using
movement actions, for example MoveToEdge. Default is 0. movement actions, for example MoveToEdge. Default is 0.
@ -603,6 +597,11 @@ extending outward from the snapped edge.
Even when disabling server side decorations via ToggleDecorations, Even when disabling server side decorations via ToggleDecorations,
keep a small border (and resize area) around the window. Default is yes. keep a small border (and resize area) around the window. Default is yes.
*<theme><maximizedDecoration>* [titlebar|none]
Specify how server side decorations are shown for maximized windows.
*titlebar* shows titlebar above a maximized window. *none* shows no server
side decorations around a maximized window. Default is titlebar.
*<theme><dropShadows>* [yes|no] *<theme><dropShadows>* [yes|no]
Should drop-shadows be rendered behind windows. Default is no. Should drop-shadows be rendered behind windows. Default is no.

View file

@ -11,7 +11,6 @@
<core> <core>
<decoration>server</decoration> <decoration>server</decoration>
<maximizedDecoration>titlebar</maximizedDecoration>
<gap>0</gap> <gap>0</gap>
<adaptiveSync>no</adaptiveSync> <adaptiveSync>no</adaptiveSync>
<allowTearing>no</allowTearing> <allowTearing>no</allowTearing>
@ -45,6 +44,7 @@
</titlebar> </titlebar>
<cornerRadius>8</cornerRadius> <cornerRadius>8</cornerRadius>
<keepBorder>yes</keepBorder> <keepBorder>yes</keepBorder>
<maximizedDecoration>titlebar</maximizedDecoration>
<dropShadows>no</dropShadows> <dropShadows>no</dropShadows>
<dropShadowsOnTiled>no</dropShadowsOnTiled> <dropShadowsOnTiled>no</dropShadowsOnTiled>
<font place="ActiveWindow"> <font place="ActiveWindow">

View file

@ -1083,12 +1083,6 @@ entry(xmlNode *node, char *nodename, char *content)
} else { } else {
rc.xdg_shell_server_side_deco = true; rc.xdg_shell_server_side_deco = true;
} }
} else if (!strcasecmp(nodename, "maximizedDecoration.core")) {
if (!strcasecmp(content, "titlebar")) {
rc.hide_maximized_window_titlebar = false;
} else if (!strcasecmp(content, "none")) {
rc.hide_maximized_window_titlebar = true;
}
} else if (!strcmp(nodename, "gap.core")) { } else if (!strcmp(nodename, "gap.core")) {
rc.gap = atoi(content); rc.gap = atoi(content);
} else if (!strcasecmp(nodename, "adaptiveSync.core")) { } else if (!strcasecmp(nodename, "adaptiveSync.core")) {
@ -1130,6 +1124,12 @@ entry(xmlNode *node, char *nodename, char *content)
rc.corner_radius = atoi(content); rc.corner_radius = atoi(content);
} else if (!strcasecmp(nodename, "keepBorder.theme")) { } else if (!strcasecmp(nodename, "keepBorder.theme")) {
set_bool(content, &rc.ssd_keep_border); set_bool(content, &rc.ssd_keep_border);
} else if (!strcasecmp(nodename, "maximizedDecoration.theme")) {
if (!strcasecmp(content, "titlebar")) {
rc.hide_maximized_window_titlebar = false;
} else if (!strcasecmp(content, "none")) {
rc.hide_maximized_window_titlebar = true;
}
} else if (!strcasecmp(nodename, "dropShadows.theme")) { } else if (!strcasecmp(nodename, "dropShadows.theme")) {
set_bool(content, &rc.shadows_enabled); set_bool(content, &rc.shadows_enabled);
} else if (!strcasecmp(nodename, "dropShadowsOnTiled.theme")) { } else if (!strcasecmp(nodename, "dropShadowsOnTiled.theme")) {