decorations: rm keepBorder

This commit is contained in:
Tobias Bengfort 2024-04-18 14:32:23 +02:00
parent 8f50e33b6d
commit 28c8924fb1
7 changed files with 3 additions and 25 deletions

View file

@ -129,9 +129,9 @@ Actions are used in menus and keyboard/mouse bindings.
*<action name="ToggleTitlebar" />* *<action name="ToggleTitlebar" />*
Toggle titlebar of focused window. Toggle titlebar of focused window.
If the 'keepBorder' configuration option is enabled (as in the default A border will be left as the only decorations around the window.
configuraton), then a border will be left as the only decorations around the If you completely want to remove all server side decorations, use
window. 'ToggleDecorations' instead.
This has no effect on windows that do not have server side decorations. This has no effect on windows that do not have server side decorations.

View file

@ -397,11 +397,6 @@ extending outward from the snapped edge.
*<theme><cornerRadius>* *<theme><cornerRadius>*
The radius of server side decoration top corners. Default is 8. The radius of server side decoration top corners. Default is 8.
*<theme><keepBorder>* [yes|no]
Keep a small border (and resize area) even for undecorated windows. Default is yes.
This has no effect on windows that do not have server side decorations.
*<theme><font place="">* *<theme><font place="">*
The font to use for a specific element of a window, menu or OSD. The font to use for a specific element of a window, menu or OSD.
Places can be any of: Places can be any of:

View file

@ -23,7 +23,6 @@
<theme> <theme>
<name></name> <name></name>
<cornerRadius>8</cornerRadius> <cornerRadius>8</cornerRadius>
<keepBorder>yes</keepBorder>
<font place="ActiveWindow"> <font place="ActiveWindow">
<name>sans</name> <name>sans</name>
<size>10</size> <size>10</size>

View file

@ -63,7 +63,6 @@ struct rcxml {
/* theme */ /* theme */
char *theme_name; char *theme_name;
int corner_radius; int corner_radius;
bool ssd_keep_border;
struct font font_activewindow; struct font font_activewindow;
struct font font_inactivewindow; struct font font_inactivewindow;
struct font font_menuitem; struct font font_menuitem;

View file

@ -838,8 +838,6 @@ entry(xmlNode *node, char *nodename, char *content)
rc.theme_name = xstrdup(content); rc.theme_name = xstrdup(content);
} else if (!strcmp(nodename, "cornerradius.theme")) { } else if (!strcmp(nodename, "cornerradius.theme")) {
rc.corner_radius = atoi(content); rc.corner_radius = atoi(content);
} else if (!strcasecmp(nodename, "keepBorder.theme")) {
set_bool(content, &rc.ssd_keep_border);
} else if (!strcmp(nodename, "name.font.theme")) { } else if (!strcmp(nodename, "name.font.theme")) {
fill_font(nodename, content, font_place); fill_font(nodename, content, font_place);
} else if (!strcmp(nodename, "size.font.theme")) { } else if (!strcmp(nodename, "size.font.theme")) {
@ -1146,7 +1144,6 @@ rcxml_init(void)
rc.placement_policy = LAB_PLACE_CENTER; rc.placement_policy = LAB_PLACE_CENTER;
rc.xdg_shell_server_side_deco = true; rc.xdg_shell_server_side_deco = true;
rc.ssd_keep_border = true;
rc.corner_radius = 8; rc.corner_radius = 8;
init_font_defaults(&rc.font_activewindow); init_font_defaults(&rc.font_activewindow);

View file

@ -33,10 +33,6 @@ ssd_thickness(struct view *view)
return (struct border){ 0 }; return (struct border){ 0 };
} }
if (!rc.ssd_keep_border && view->ssd_titlebar_hidden) {
return (struct border){ 0 };
}
struct theme *theme = view->server->theme; struct theme *theme = view->server->theme;
if (view->maximized == VIEW_AXIS_BOTH) { if (view->maximized == VIEW_AXIS_BOTH) {

View file

@ -72,14 +72,6 @@ ssd_border_update(struct ssd *ssd)
ssd->margin = ssd_thickness(ssd->view); ssd->margin = ssd_thickness(ssd->view);
} }
if (!rc.ssd_keep_border && view->ssd_titlebar_hidden) {
if (ssd->border.tree->node.enabled) {
wlr_scene_node_set_enabled(&ssd->border.tree->node, false);
ssd->margin = ssd_thickness(ssd->view);
}
return;
}
if (view->maximized == VIEW_AXIS_BOTH) { if (view->maximized == VIEW_AXIS_BOTH) {
return; return;
} else if (!ssd->border.tree->node.enabled) { } else if (!ssd->border.tree->node.enabled) {