diff --git a/core/wiki/macros/sidebar-resizer.tid b/core/wiki/macros/sidebar-resizer.tid index e3f00ab94..4fe791767 100644 --- a/core/wiki/macros/sidebar-resizer.tid +++ b/core/wiki/macros/sidebar-resizer.tid @@ -58,7 +58,7 @@ title: $:/core/macros/sidebar-resizer \procedure set-storyright-actions() <$let storyLeftStart={{{ [convert.to.pixels{$:/state/sidebar/resizing!!start-story-left}] }}} storyRightStart={{{ [convert.to.pixels{$:/state/sidebar/resizing!!start-story-right}] }}} storyWidth={{{ [convert.to.pixels{$:/themes/tiddlywiki/vanilla/metrics/storywidth}] }}} sidebarMinWidthConverted={{{ [convert.to.pixels{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}] }}} storyRiverLimit={{{ [subtract] }}} storyDiff={{{ [addsubtractmultiply[-1]] }}}> - <$let storyRightMetric={{$:/state/sidebar/resizing!!story-right-metric}} storyRiverWidthConverted={{{ [function[convert.to.result],,] }}} storyRiverLimitConverted={{{ [function[convert.to.result],,] }}} storyDiffConverted={{{ [!match[ctrl]then] ~0 }}} storyWidthConverted={{{ [function[convert.to.result],,] }}}> + <$let storyRightMetric={{$:/state/sidebar/resizing!!story-right-metric}} storyRiverWidthConverted={{{ [function[convert.to.result],,] }}} storyRiverLimitConverted={{{ [function[convert.to.result],,] }}} storyDiffConverted={{{ [!match[ctrl]then{$:/state/sidebar/resizing!!modifier}!match[ctrl]then] ~0 }}} storyWidthConverted={{{ [function[convert.to.result],,] }}}> <$action-setfield $tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyright" text={{{ [subtractcompare:number:ltthenaddaddsuffix] ~[compare:number:gteqthenaddsuffix] ~[addsuffix] }}}/> @@ -83,6 +83,9 @@ title: $:/core/macros/sidebar-resizer \procedure sidebar-resizer-pointermove-actions() <%if [[$:/state/sidebar/resizing]!is[missing]] %> <$let widgetNodeWidth={{$:/state/sidebar/resizing!!widget-node-width}} dragDiff={{{ [subtract{$:/state/sidebar/resizing!!start-posx}] }}} startStoryRight={{{ [convert.to.pixels{$:/state/sidebar/resizing!!start-story-right}] }}} storyRiverWidth={{{ [add] }}} startSidebarWidth={{{ [convert.to.pixels{$:/state/sidebar/resizing!!start-sidebar-width}] }}} sidebarWidth={{{ [subtract] }}}> + <%if [match[ctrl]then{$:/state/sidebar/resizing!!modifier}!match[ctrl]] %> + <$action-setfield $tiddler="$:/state/sidebar/resizing" modifier="ctrl"/> + <% endif %> <%if [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fixed-fluid]] %> <> <>