From 0446285a69af23bde8142c08f4f4c8f65772e919 Mon Sep 17 00:00:00 2001
From: BurningTreeC <huber.simon@protonmail.com>
Date: Sat, 28 Sep 2024 13:44:45 +0200
Subject: [PATCH] further optimizations

---
 .../tw5.com/tiddlers/_tw_shared/styles.tid    |  2 +-
 themes/tiddlywiki/vanilla/base.tid            | 63 +---------------
 themes/tiddlywiki/vanilla/fluid-fixed.tid     | 71 +++++++++++++++++++
 themes/tiddlywiki/vanilla/sidebar-resizer.tid |  2 +-
 4 files changed, 75 insertions(+), 63 deletions(-)
 create mode 100644 themes/tiddlywiki/vanilla/fluid-fixed.tid

diff --git a/editions/tw5.com/tiddlers/_tw_shared/styles.tid b/editions/tw5.com/tiddlers/_tw_shared/styles.tid
index 670de0757..f29ec51be 100644
--- a/editions/tw5.com/tiddlers/_tw_shared/styles.tid
+++ b/editions/tw5.com/tiddlers/_tw_shared/styles.tid
@@ -1,6 +1,6 @@
 title: $:/_tw_shared/styles
 tags: $:/tags/Stylesheet TiddlyWikiSitesMenu
-refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
+refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock
 
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index f504caa86..a4167f2e8 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1,7 +1,7 @@
 title: $:/themes/tiddlywiki/vanilla/base
 tags: [[$:/tags/Stylesheet]]
-list-before:
-refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]] -$:/state/sidebar
+list-before: $:/themes/tiddlywiki/vanilla/fluid-fixed
+refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]]
 code-body: yes
 
 \define custom-background-datauri()
@@ -32,15 +32,6 @@ background-size:` {{$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize}}`
 <$text text={{{ [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]subtract[1]addsuffix[px]] ~[{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}] }}}/>
 \end
 
-\define if-fluid-fixed(text,hiddenSidebarText)
-<%if [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fluid-fixed]] [[$:/state/sidebar/dimensions]!is[missing]] %>
-$text$
-<$reveal state="$:/state/sidebar" type="nomatch" text="yes" default="yes">
-$hiddenSidebarText$
-</$reveal>
-<% endif %>
-\end
-
 \define if-editor-height-fixed(then,else)
 <$reveal state="$:/config/TextEditor/EditorHeight/Mode" type="match" text="fixed">
 $then$
@@ -1471,56 +1462,6 @@ html body.tc-body.tc-single-tiddler-window {
 	font-weight: normal;
 }
 
-/*
-** Adjustments for fluid-fixed mode
-*/
-
-@media (min-width: <<sidebarbreakpoint>>) {
-
-<<if-fluid-fixed text:"""
-
-	.tc-story-river {
-		padding-right: 0;
-		position: relative;
-		width: auto;
-		max-width: 100%;
-		left: 0;
-		margin-left: {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}};
-		margin-right: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth}};
-	}
-
-	.tc-tiddler-frame {
-		width: 100%;
-	}
-
-	.tc-sidebar-scrollable {
-		left: auto;
-		bottom: 0;
-		right: 0;
-		width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth}};
-	}
-
-	body.tc-body .tc-page-container.tc-page-view-zoomin .tc-tiddler-frame {
-		width: 100%;
-		width: calc(100% - 42px);
-	}
-
-""" hiddenSidebarText:"""
-
-	.tc-story-river {
-		padding-right: 3em;
-		margin-right: 0;
-	}
-
-	body.tc-body .tc-page-container.tc-page-view-zoomin .tc-tiddler-frame {
-		width: 100%;
-		width: calc(100% - 84px);
-	}
-
-""">>
-
-}
-
 /*
 ** Toolbar buttons
 */
diff --git a/themes/tiddlywiki/vanilla/fluid-fixed.tid b/themes/tiddlywiki/vanilla/fluid-fixed.tid
new file mode 100644
index 000000000..ac5c82394
--- /dev/null
+++ b/themes/tiddlywiki/vanilla/fluid-fixed.tid
@@ -0,0 +1,71 @@
+title: $:/themes/tiddlywiki/vanilla/fluid-fixed
+tags: [[$:/tags/Stylesheet]]
+list-before: 
+refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]] -$:/state/sidebar -$:/state/sidebar/dimensions
+
+\define if-fluid-fixed(text,hiddenSidebarText)
+<%if [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fluid-fixed]] [[$:/state/sidebar/dimensions]!is[missing]] %>
+$text$
+<$reveal state="$:/state/sidebar" type="nomatch" text="yes" default="yes">
+$hiddenSidebarText$
+</$reveal>
+<% endif %>
+\end
+
+\define sidebarbreakpoint()
+<$text text={{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}/>
+\end
+
+\define sidebarbreakpoint-minus-one()
+<$text text={{{ [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]subtract[1]addsuffix[px]] ~[{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}] }}}/>
+\end
+
+/*
+** Adjustments for fluid-fixed mode
+*/
+
+@media (min-width: <<sidebarbreakpoint>>) {
+
+<<if-fluid-fixed text:"""
+
+	.tc-story-river {
+		padding-right: 0;
+		position: relative;
+		width: auto;
+		max-width: 100%;
+		left: 0;
+		margin-left: {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}};
+		margin-right: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth}};
+	}
+
+	.tc-tiddler-frame {
+		width: 100%;
+	}
+
+	.tc-sidebar-scrollable {
+		left: auto;
+		bottom: 0;
+		right: 0;
+		width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth}};
+	}
+
+	body.tc-body .tc-page-container.tc-page-view-zoomin .tc-tiddler-frame {
+		width: 100%;
+		width: calc(100% - 42px);
+	}
+
+""" hiddenSidebarText:"""
+
+	.tc-story-river {
+		padding-right: 3em;
+		margin-right: 0;
+	}
+
+	body.tc-body .tc-page-container.tc-page-view-zoomin .tc-tiddler-frame {
+		width: 100%;
+		width: calc(100% - 84px);
+	}
+
+""">>
+
+}
\ No newline at end of file
diff --git a/themes/tiddlywiki/vanilla/sidebar-resizer.tid b/themes/tiddlywiki/vanilla/sidebar-resizer.tid
index 77402a8dc..b996a58ad 100644
--- a/themes/tiddlywiki/vanilla/sidebar-resizer.tid
+++ b/themes/tiddlywiki/vanilla/sidebar-resizer.tid
@@ -1,6 +1,6 @@
 title: $:/themes/tiddlywiki/vanilla/sidebar-resizer
 tags: [[$:/tags/Stylesheet]]
-refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] -$:/state/sidebar/dimensions -$:/state/sidebar -$:/state/sidebar/resizing [all[tiddlers]is[draft]]
+refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]] -$:/state/sidebar/resizing -$:/state/sidebar/dimensions -$:/state/sidebar
 code-body: yes
 
 \define sidebarbreakpoint()