From 8db881781c26612eb959b5c8db5da286ebbaa37a Mon Sep 17 00:00:00 2001 From: z1glr Date: Sun, 30 Nov 2025 18:07:35 +0100 Subject: [PATCH 1/3] added box for exact input to sliders --- .../components/settings/GeneralOptions.vue | 6 +- .../components/settings/Sliders/HueInput.vue | 30 +++++ .../settings/Sliders/LightnessInput.vue | 24 ++++ .../settings/Sliders/RangeInput.vue | 82 ++++++++++++ .../settings/Sliders/SaturationInput.vue | 22 ++++ .../settings/presets/ClassicPreset.vue | 58 +-------- .../settings/presets/ModernPreset.vue | 2 +- .../components/settings/presets/NeoPreset.vue | 118 ++++-------------- 8 files changed, 188 insertions(+), 154 deletions(-) create mode 100644 StreamAwesome/src/components/settings/Sliders/HueInput.vue create mode 100644 StreamAwesome/src/components/settings/Sliders/LightnessInput.vue create mode 100644 StreamAwesome/src/components/settings/Sliders/RangeInput.vue create mode 100644 StreamAwesome/src/components/settings/Sliders/SaturationInput.vue diff --git a/StreamAwesome/src/components/settings/GeneralOptions.vue b/StreamAwesome/src/components/settings/GeneralOptions.vue index 40cb994c..63b0a904 100644 --- a/StreamAwesome/src/components/settings/GeneralOptions.vue +++ b/StreamAwesome/src/components/settings/GeneralOptions.vue @@ -15,6 +15,7 @@ import Icon from '@/components/utils/IconDisplay.vue' import type { FontAwesomeIcon } from '@/model/fontAwesomeIcon' import { ref } from 'vue' import { fontAwesomeVersionInfo } from '@/model/versions' +import RangeInput from './Sliders/RangeInput.vue' const props = defineProps<{ icon: CustomIcon @@ -96,14 +97,13 @@ function updateStyle(style: FontAwesomeStyle) { - diff --git a/StreamAwesome/src/components/settings/Sliders/HueInput.vue b/StreamAwesome/src/components/settings/Sliders/HueInput.vue new file mode 100644 index 00000000..225c1ae1 --- /dev/null +++ b/StreamAwesome/src/components/settings/Sliders/HueInput.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/StreamAwesome/src/components/settings/Sliders/LightnessInput.vue b/StreamAwesome/src/components/settings/Sliders/LightnessInput.vue new file mode 100644 index 00000000..5ba9b9c4 --- /dev/null +++ b/StreamAwesome/src/components/settings/Sliders/LightnessInput.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/StreamAwesome/src/components/settings/Sliders/RangeInput.vue b/StreamAwesome/src/components/settings/Sliders/RangeInput.vue new file mode 100644 index 00000000..6508dee8 --- /dev/null +++ b/StreamAwesome/src/components/settings/Sliders/RangeInput.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/StreamAwesome/src/components/settings/Sliders/SaturationInput.vue b/StreamAwesome/src/components/settings/Sliders/SaturationInput.vue new file mode 100644 index 00000000..71bf3d30 --- /dev/null +++ b/StreamAwesome/src/components/settings/Sliders/SaturationInput.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/StreamAwesome/src/components/settings/presets/ClassicPreset.vue b/StreamAwesome/src/components/settings/presets/ClassicPreset.vue index 37ec22bc..b9755ea4 100644 --- a/StreamAwesome/src/components/settings/presets/ClassicPreset.vue +++ b/StreamAwesome/src/components/settings/presets/ClassicPreset.vue @@ -1,6 +1,7 @@ - + diff --git a/StreamAwesome/src/components/settings/presets/ModernPreset.vue b/StreamAwesome/src/components/settings/presets/ModernPreset.vue index ee0f8c32..3b615c31 100644 --- a/StreamAwesome/src/components/settings/presets/ModernPreset.vue +++ b/StreamAwesome/src/components/settings/presets/ModernPreset.vue @@ -29,7 +29,7 @@ function applyDefaultSettings() { v-model="(currentIcon as CustomIcon<'Modern'>).presetSettings.inverted" />
Invert Colors diff --git a/StreamAwesome/src/components/settings/presets/NeoPreset.vue b/StreamAwesome/src/components/settings/presets/NeoPreset.vue index 3167cf86..96f58ed5 100644 --- a/StreamAwesome/src/components/settings/presets/NeoPreset.vue +++ b/StreamAwesome/src/components/settings/presets/NeoPreset.vue @@ -2,6 +2,10 @@ import { ref } from 'vue' import type { CustomIcon, FontAwesomePreset } from '@/model/customIcon' import { ColorSpaceKeys } from '@/model/customIcon' +import HuePicker from '../Sliders/HueInput.vue' +import SaturationInput from '../Sliders/SaturationInput.vue' +import LightnessInput from '../Sliders/LightnessInput.vue' +import RangeInput from '../Sliders/RangeInput.vue' const props = defineProps<{ icon: CustomIcon @@ -28,7 +32,7 @@ function applyDefaultSettings() { currentIcon.value.fontAwesomeIcon.family = 'classic' } -const currentHue = ref((currentIcon.value as CustomIcon<'Neo'>).presetSettings.hueStart) +// const currentHue = ref((currentIcon.value as CustomIcon<'Neo'>).presetSettings.hueStart) const settingsExpanded = ref(false) const toggleSettings = () => { @@ -37,17 +41,14 @@ const toggleSettings = () => { - - From 649fd8c25aaae046572e2ce5f4e4ef234c6edb80 Mon Sep 17 00:00:00 2001 From: z1glr Date: Sun, 30 Nov 2025 18:14:54 +0100 Subject: [PATCH 2/3] added deprecated fills --- StreamAwesome/src/components/settings/Sliders/HueInput.vue | 6 +++--- .../src/components/settings/Sliders/LightnessInput.vue | 2 +- .../src/components/settings/Sliders/RangeInput.vue | 1 + .../src/components/settings/Sliders/SaturationInput.vue | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/StreamAwesome/src/components/settings/Sliders/HueInput.vue b/StreamAwesome/src/components/settings/Sliders/HueInput.vue index 225c1ae1..7923e5f6 100644 --- a/StreamAwesome/src/components/settings/Sliders/HueInput.vue +++ b/StreamAwesome/src/components/settings/Sliders/HueInput.vue @@ -11,7 +11,7 @@ const currentHue = ref(hue) diff --git a/StreamAwesome/src/components/settings/Sliders/LightnessInput.vue b/StreamAwesome/src/components/settings/Sliders/LightnessInput.vue index 5ba9b9c4..1611b31a 100644 --- a/StreamAwesome/src/components/settings/Sliders/LightnessInput.vue +++ b/StreamAwesome/src/components/settings/Sliders/LightnessInput.vue @@ -13,7 +13,7 @@ const lightness = defineModel()