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

diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index d389c4cfaf3d1698afa0644ae7b9c00546221ed4..21ac262951f98be0e8858a5d82efacb7c2d3f47d 100644 (file)
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -171,7 +171,6 @@ this is for compatibility with Openbox.
 ```
 <core>
   <decoration>server</decoration>
-  <maximizedDecoration>titlebar</maximizedDecoration>
   <gap>0</gap>
   <adaptiveSync>no</adaptiveSync>
   <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.
        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>*
        The distance in pixels between windows and output edges when using
        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,
        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]
        Should drop-shadows be rendered behind windows. Default is no.
 

diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index ed80fdf0739e924df12c7687c1cdaa985bf1d19e..44ed984a468db690beaad92be7ec05d911f25536 100644 (file)
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -11,7 +11,6 @@
 
   <core>
     <decoration>server</decoration>
-    <maximizedDecoration>titlebar</maximizedDecoration>
     <gap>0</gap>
     <adaptiveSync>no</adaptiveSync>
     <allowTearing>no</allowTearing>
@@ -45,6 +44,7 @@
     </titlebar>
     <cornerRadius>8</cornerRadius>
     <keepBorder>yes</keepBorder>
+    <maximizedDecoration>titlebar</maximizedDecoration>
     <dropShadows>no</dropShadows>
     <dropShadowsOnTiled>no</dropShadowsOnTiled>
     <font place="ActiveWindow">

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 1353b3c22aad0616983633fa9c338dbec9138de5..4ed6bd6d0aa65ccd14d961fe967a3f35d919d294 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -1083,12 +1083,6 @@ entry(xmlNode *node, char *nodename, char *content)
                } else {
                        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")) {
                rc.gap = atoi(content);
        } else if (!strcasecmp(nodename, "adaptiveSync.core")) {
@@ -1130,6 +1124,12 @@ entry(xmlNode *node, char *nodename, char *content)
                rc.corner_radius = atoi(content);
        } else if (!strcasecmp(nodename, "keepBorder.theme")) {
                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")) {
                set_bool(content, &rc.shadows_enabled);
        } else if (!strcasecmp(nodename, "dropShadowsOnTiled.theme")) {