From ab9d4ec4fa5ca81379ae778f8d8ccc8a9d46a728 Mon Sep 17 00:00:00 2001
From: nerdi <erni1983@gmail.com>
Date: Mon, 24 Aug 2026 13:04:38 +0200
Subject: [PATCH] fix(view): restore column width after fullscreen

---
 src/view/view.cpp                             |  5 ++-
 .../checks/170_fullscreen_restore_width.sh    | 38 +++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100755 tests/harness/checks/170_fullscreen_restore_width.sh

diff --git a/src/view/view.cpp b/src/view/view.cpp
index 425f2e9..81b38d5 100644
--- a/src/view/view.cpp
+++ b/src/view/view.cpp
@@ -2142,11 +2142,12 @@ namespace umbriel {
       m_refullscreenOnTile = false;
     }
     // Leaving column maximize when entering real fullscreen avoids a stale
-    // widthFrac=1.0 column after the client leaves fullscreen.
+    // widthFrac=1.0 column after the client leaves fullscreen. Toggle it off
+    // so ScrollingLayout restores the width saved when maximize was enabled.
     if (fullscreen && m_tiled && m_workspace != nullptr) {
       const int column = m_workspace->layout().columnOf(this);
       if (m_workspace->layout().isFullWidth(column)) {
-        m_workspace->layout().clearFullWidthState(column);
+        m_workspace->layout().toggleFullWidth(column);
         wlr_xdg_toplevel_set_maximized(m_toplevel, false);
       }
     }
diff --git a/tests/harness/checks/170_fullscreen_restore_width.sh b/tests/harness/checks/170_fullscreen_restore_width.sh
new file mode 100755
index 0000000..24e835a
--- /dev/null
+++ b/tests/harness/checks/170_fullscreen_restore_width.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Entering fullscreen from a full-width column must preserve the column width that maximize saved for restoration.
+set -euo pipefail
+
+window_width() {
+  "$UMBRIEL" windows --json | jq -r '.[] | select(.title == "fullscreen-width") | .w'
+}
+
+readonly CLIENT="$(dirname "$UMBRIEL")/subsurface-client"
+readonly CLIENT_LOG="$UMBRIEL_RUNTIME_DIR/fullscreen-width-client.log"
+
+wait_for_width() {
+  local expected=$1
+  for _ in $(seq 60); do
+    [[ $(window_width) == "$expected" ]] && return 0
+    sleep 0.1
+  done
+  echo "timed out waiting for width $expected: $($UMBRIEL windows --json)"
+  return 1
+}
+
+"$CLIENT" fullscreen-width 640 480 > "$CLIENT_LOG" 2>&1 &
+
+# The default 0.5 scrolling column is 624 px on the 1280x720 harness output.
+readonly ORIGINAL_WIDTH=624
+readonly FULL_WIDTH=1260
+wait_for_width "$ORIGINAL_WIDTH"
+
+"$UMBRIEL" msg window-toggle-maximize > /dev/null
+wait_for_width "$FULL_WIDTH"
+
+"$UMBRIEL" msg window-toggle-fullscreen > /dev/null
+wait_for_width 1280
+
+"$UMBRIEL" msg window-toggle-fullscreen > /dev/null
+wait_for_width "$ORIGINAL_WIDTH"
+
+echo "fullscreen round trip restored the maximized column from $FULL_WIDTH to $ORIGINAL_WIDTH"