diff --git a/core/wiki/macros/sidebar-resizer.tid b/core/wiki/macros/sidebar-resizer.tid index 81ee0222d..c51eb07c3 100644 --- a/core/wiki/macros/sidebar-resizer.tid +++ b/core/wiki/macros/sidebar-resizer.tid @@ -60,11 +60,11 @@ title: $:/core/procedures/sidebar-resizer \procedure sidebar-resizer-pointerdown-actions-inner() <%if [is[missing]thenmatch[left]] %> <$let - startStoryLeft={{{ [!is[blank]get[text]] :else[get.theme.metric[storyleft]] }}} - startStoryRight={{{ [!is[blank]get[text]] :else[get.theme.metric[storyright]] }}} - startSidebarWidth={{{ [!is[blank]get[text]] :else[get.theme.metric[sidebarwidth]] }}} - startTiddlerWidth={{{ [!is[blank]get[text]] :else[get.theme.metric[tiddlerwidth]] }}} - startStoryWidth={{{ [!is[blank]get[text]] :else[get.theme.metric[storywidth]] }}}> + startStoryLeft={{{ [!is[blank]!is[missing]get[text]] :else[!is[blank]is[missing]then[0px]] :else[get.theme.metric[storyleft]] }}} + startStoryRight={{{ [!is[blank]!is[missing]get[text]] :else[!is[blank]is[missing]then[0px]] :else[get.theme.metric[storyright]] }}} + startSidebarWidth={{{ [!is[blank]!is[missing]get[text]] :else[!is[blank]is[missing]then[0px]] :else[get.theme.metric[sidebarwidth]] }}} + startTiddlerWidth={{{ [!is[blank]!is[missing]get[text]] :else[!is[blank]is[missing]then[0px]] :else[get.theme.metric[tiddlerwidth]] }}} + startStoryWidth={{{ [!is[blank]!is[missing]get[text]] :else[!is[blank]is[missing]then[0px]] :else[get.theme.metric[storywidth]] }}}> <$action-setfield $tiddler=<> text="yes" widget-node-width=<> @@ -287,9 +287,9 @@ title: $:/core/procedures/sidebar-resizer <% endif %> \end -\function get.sidebar-resizer.class() tc-sidebar-resizer [!is[missing]then[tc-resizer-active]] [resizer.class[]] [addsuffix[-]addsuffixsha256[]addprefix[tc-sidebar-resizer-]] +[join[ ]] +\function get.sidebar-resizer.class() tc-sidebar-resizer [!is[missing]then[tc-resizer-active]] [] [addsuffix[-]addsuffixsha256[]addprefix[tc-sidebar-resizer-]] +[join[ ]] -\function get.active.class(class) [] [!is[missing]then[tc-resizer-active]] +[join[ ]] +\function get.active.class(class) [] [] [!is[missing]then[tc-resizer-active]] +[join[ ]] \function get.sidebar-resizer.pointerdown.actions() [match[$:/state/sidebar/resizing]then] @@ -334,7 +334,17 @@ title: $:/core/procedures/sidebar-resizer <%if [!is[blank]] %> - <$transclude $tiddler=<> mode="block"/> +
>> + + <$transclude $tiddler=<> mode="block"/> + +
<% endif %> @@ -345,7 +355,17 @@ title: $:/core/procedures/sidebar-resizer <%if [!is[blank]] %> - <$transclude $tiddler=<> mode="block"/> +
> + style.width=<>> + + <$transclude $tiddler=<> mode="block"/> + +
<% endif %> diff --git a/themes/tiddlywiki/vanilla/sidebar-resizer.tid b/themes/tiddlywiki/vanilla/sidebar-resizer.tid index db18d10e9..30ad795fb 100644 --- a/themes/tiddlywiki/vanilla/sidebar-resizer.tid +++ b/themes/tiddlywiki/vanilla/sidebar-resizer.tid @@ -51,6 +51,16 @@ code-body: yes z-index: -1; } + .tc-sidebar-resizer-pointerdown-eventcatcher:not(.tc-main-sidebar-resizer), .tc-sidebar-resizer-pointermove-eventcatcher:not(.tc-main-sidebar-resizer), .tc-sidebar-resizer-pointermove-eventcatcher-wrapper:not(.tc-main-sidebar-resizer) { + display: flex; + flex-direction: column; + flex-grow: 1; + } + + .tc-sidebar-resizer-pointerdown-eventcatcher:not(.tc-main-sidebar-resizer), .tc-sidebar-resizer-pointermove-eventcatcher-wrapper:not(.tc-main-sidebar-resizer) { + position: relative; + } + .tc-sidebar-resizer, .tc-sidebar-resizer-pointermove-eventcatcher, .tc-sidebar-resizer-pointermove { touch-action: none; user-select: none;