From aaa210d6623be15da05f8be4be81d558142ea52c Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Mon, 31 May 2021 00:17:06 +0200
Subject: [PATCH] Make ColorPicker buttons halfwidth

---
 ts/components/IconButton.svelte |  8 +++++---
 ts/editor/ColorButtons.svelte   | 28 +++++++++++++---------------
 ts/editor/icons.ts              |  3 +++
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ts/components/IconButton.svelte b/ts/components/IconButton.svelte
index eb1437701..5377e3e56 100644
--- a/ts/components/IconButton.svelte
+++ b/ts/components/IconButton.svelte
@@ -13,11 +13,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export { className as class };
 
     export let tooltip: string | undefined = undefined;
-    export let iconSize: number = 80;
     export let active = false;
     export let disables = true;
     export let tabbable = false;
 
+    export let iconSize: number = 80;
+    export let widthMultiplier: number = 1;
+
     let buttonRef: HTMLButtonElement;
 
     const disabled = getContext<Readable<boolean>>(disabledKey);
@@ -46,7 +48,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     on:click
     on:mousedown|preventDefault
 >
-    <span> <slot /> </span>
+    <span style={`--width-multiplier: ${widthMultiplier};`}> <slot /> </span>
 </button>
 
 <style lang="scss">
@@ -66,7 +68,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         vertical-align: middle;
 
         /* constrain icon */
-        width: calc(var(--buttons-size) - 2px);
+        width: calc((var(--buttons-size) - 2px) * var(--width-multiplier));
         height: calc(var(--buttons-size) - 2px);
 
         & > :global(svg),
diff --git a/ts/editor/ColorButtons.svelte b/ts/editor/ColorButtons.svelte
index a87a31a85..9940bc177 100644
--- a/ts/editor/ColorButtons.svelte
+++ b/ts/editor/ColorButtons.svelte
@@ -12,7 +12,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import WithShortcut from "components/WithShortcut.svelte";
     import WithColorHelper from "./WithColorHelper.svelte";
 
-    import { textColorIcon, highlightColorIcon } from "./icons";
+    import { textColorIcon, highlightColorIcon, arrowIcon } from "./icons";
     import { appendInParentheses } from "./helpers";
 
     export let api = {};
@@ -52,7 +52,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                         shortcutLabel
                     )}
                     disables={false}
+                    widthMultiplier={0.5}
                 >
+                    {@html arrowIcon}
                     <ColorPicker on:change={setColor} on:mount={createShortcut} />
                 </IconButton>
             </WithShortcut>
@@ -61,23 +63,19 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     <WithColorHelper let:colorHelperIcon let:color let:setColor>
         <ButtonGroupItem>
-            <WithShortcut shortcut={"F7"} let:createShortcut let:shortcutLabel>
-                <IconButton
-                    tooltip={appendInParentheses(
-                        tr.editingSetForegroundColor(),
-                        shortcutLabel
-                    )}
-                    on:click={wrapWithBackcolor(color)}
-                    on:mount={createShortcut}
-                >
-                    {@html highlightColorIcon}
-                    {@html colorHelperIcon}
-                </IconButton>
-            </WithShortcut>
+            <IconButton on:click={wrapWithBackcolor(color)}>
+                {@html highlightColorIcon}
+                {@html colorHelperIcon}
+            </IconButton>
         </ButtonGroupItem>
 
         <ButtonGroupItem>
-            <IconButton tooltip={tr.editingChangeColor()} disables={false}>
+            <IconButton
+                tooltip={tr.editingChangeColor()}
+                disables={false}
+                widthMultiplier={0.5}
+            >
+                {@html arrowIcon}
                 <ColorPicker on:change={setColor} />
             </IconButton>
         </ButtonGroupItem>
diff --git a/ts/editor/icons.ts b/ts/editor/icons.ts
index 978045565..2907e2d5a 100644
--- a/ts/editor/icons.ts
+++ b/ts/editor/icons.ts
@@ -30,3 +30,6 @@ export { default as micIcon } from "./mic.svg";
 export { default as bracketsIcon } from "./code-brackets.svg";
 export { default as functionIcon } from "./function-variant.svg";
 export { default as xmlIcon } from "./xml.svg";
+
+export const arrowIcon =
+    '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="transparent" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2 5l6 6 6-6"/></svg>';