From 873393a8da833e8db06f15c8c3ed404cf4982b44 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Thu, 18 Apr 2024 13:36:51 +0200 Subject: [PATCH] decorations: restore old ToggleDecorations behavior This reverts part of commit e39744f1d3350611b3d9ef76ad5f865c168d07a4. --- docs/labwc-actions.5.scd | 8 -------- src/view.c | 19 ------------------- 2 files changed, 27 deletions(-) diff --git a/docs/labwc-actions.5.scd b/docs/labwc-actions.5.scd index 3353fcfa..4966d404 100644 --- a/docs/labwc-actions.5.scd +++ b/docs/labwc-actions.5.scd @@ -120,14 +120,6 @@ Actions are used in menus and keyboard/mouse bindings. ** Toggle decorations of focused window. - This is a 3-state action which can be executed multiple times: - - Only the titlebar will be hidden, borders and resize area are kept - - Remaining decorations will be disabled - - Decorations will be shown normally - - By disabling the theme configuration 'keepBorder' the first step - will be removed and the action only toggles between on and off. - ** Toggle fullscreen state of focused window. diff --git a/src/view.c b/src/view.c index 9e8ab703..244a0a73 100644 --- a/src/view.c +++ b/src/view.c @@ -1198,24 +1198,6 @@ view_toggle_decorations(struct view *view) { assert(view); - /* Reject decoration toggles when shaded */ - if (view->shaded) { - return; - } - - if (rc.ssd_keep_border && view->ssd_enabled && view->ssd - && !view->ssd_titlebar_hidden) { - /* - * ssd_titlebar_hidden has to be set before calling - * ssd_titlebar_hide() to make ssd_thickness() happy. - */ - view->ssd_titlebar_hidden = true; - ssd_titlebar_hide(view->ssd); - if (!view_is_floating(view)) { - view_apply_special_geometry(view); - } - return; - } view_set_decorations(view, !view->ssd_enabled); } @@ -1313,7 +1295,6 @@ view_set_decorations(struct view *view, bool decorations) decorate(view); } else { undecorate(view); - view->ssd_titlebar_hidden = false; } if (!view_is_floating(view)) { view_apply_special_geometry(view);