Fix #4755 - Indirect colours not shown in palette switcher (#4757)

* Fix #4755 - Indirect colours not shown in palette switcher

* Update currpalettepreview.tid

* Update currpalettepreview.tid
optimising-macrocalls
Simon Huber 2020-07-15 13:23:13 +02:00 zatwierdzone przez GitHub
rodzic 00ff0d6fa0
commit 484c9e986f
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 32 dodań i 3 usunięć

Wyświetl plik

@ -1,11 +1,40 @@
title: $:/snippets/currpalettepreview
\define resolve-colour(macrocall)
\import $:/core/macros/utils
\whitespace trim
<$wikify name="name" text="""$macrocall$""">
<<name>>
</$wikify>
\end
\define swatchStyle()
background-color: $(swatchColour)$;
\end
\define swatch-inner()
<$set name="swatchColour" value={{##$(colourResolved)$}}>
<$list filter="[<swatchColour>!prefix[<<colour ]!suffix[>>]]" variable="ignore">
<div class="tc-swatch" style=<<swatchStyle>> title=<<swatchTitle>>/>
</$list>
<$list filter="[<swatchColour>prefix[<<colour ]suffix[>>]]" variable="ignore">
<$wikify name="colourResolved" text="""<$macrocall $name="resolve-colour" macrocall=<<swatchColour>>/>""">
<<swatch-inner>>
</$wikify>
</$list>
</$set>
\end
\define swatch()
<$set name="swatchColour" value={{##$(colour)$}}
><div class="tc-swatch" style=<<swatchStyle>> title=<<colour>>/></$set>
<$set name="swatchColour" value={{##$(colour)$}}>
<$set name="swatchTitle" value=<<colour>>>
<$list filter="[<swatchColour>!prefix[<<colour ]!suffix[>>]]" variable="ignore">
<div class="tc-swatch" style=<<swatchStyle>> title=<<swatchTitle>>/>
</$list>
<$list filter="[<swatchColour>prefix[<<colour ]suffix[>>]]" variable="ignore">
<$wikify name="colourResolved" text="""<$macrocall $name="resolve-colour" macrocall=<<swatchColour>>/>""">
<<swatch-inner>>
</$wikify>
</$list>
</$set>
</$set>
\end
<div class="tc-swatches-horiz"><$list filter="
foreground
@ -15,4 +44,4 @@ primary
page-background
tab-background
tiddler-info-background
" variable="colour"><<swatch>></$list></div>
" variable="colour"><<swatch>></$list></div>