Fixed: Wrong icon in color selector in Panel/Container config popup

thezac · Mar 28, 2023 · 00a4bc0 · 00a4bc0
1 parent 8140ad7
commit 00a4bc0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/page.setup/components/popup.container-config.vue b/src/page.setup/components/popup.container-config.vue
@@ -18,7 +18,7 @@
     label="container.color_label"
     :value="color"
     :opts="COLOR_OPTS"
-    :icon="icon"
+    :icon="'#' + icon"
     @update:value="updateColor")
 
   .InfoField
@@ -119,7 +119,7 @@ const proxyPasswordInput = ref<TextInputComponent | null>(null)
 const userAgentInput = ref<TextInputComponent | null>(null)
 
 const name = computed((): string => props.conf.name || '')
-const icon = computed((): string => (props.conf.icon ? '#' + props.conf.icon : '#fingerprint'))
+const icon = computed((): string => (props.conf.icon ? props.conf.icon : '#fingerprint'))
 const color = computed((): string => props.conf.color || 'blue')
 const proxied = computed((): string => props.conf.proxy?.type ?? 'direct')
 const isSomeSocks = computed((): boolean => proxied.value === 'socks' || proxied.value === 'socks4')

diff --git a/src/page.setup/components/popup.panel-config.vue b/src/page.setup/components/popup.panel-config.vue
@@ -31,7 +31,7 @@
     label="panel.color_label"
     :value="color"
     :opts="COLOR_OPTS"
-    :icon="iconSVG"
+    :icon="'#' + iconSVG"
     @update:value="setColor")
 
   .TextField.custom-icon(v-if="Utils.isTabsPanel(conf) || Utils.isBookmarksPanel(conf)")
@@ -253,7 +253,7 @@ const availableForAutoMoveContainersOpts = computed<ContainerOption[]>(() => {
 
   return result
 })
-const iconSVG = computed<string>(() => (props.conf.iconSVG ? '#' + props.conf.iconSVG : ''))
+const iconSVG = computed<string>(() => props.conf.iconSVG ?? '')
 const color = computed<string>(() => props.conf.color || '')
 const newTabCtx = computed<string>(() => {
   return (Utils.isTabsPanel(props.conf) && props.conf.newTabCtx) || ''

diff --git a/src/sidebar/components/popup.container-config.vue b/src/sidebar/components/popup.container-config.vue
@@ -25,7 +25,7 @@
       SelectInput.input(
         v-model:value="Sidebar.reactive.containerConfigPopup.color"
         :opts="COLOR_OPTS"
-        :icon="Sidebar.reactive.containerConfigPopup.icon"
+        :icon="'#' + Sidebar.reactive.containerConfigPopup.icon"
       )
 
     .ctrls