fixed shadow preview, added more safeguards for spread on separateInset shadows
This commit is contained in:
parent
aa7a336183
commit
a0c303efb6
1
changelog.d/better-shadow-control.fix
Normal file
1
changelog.d/better-shadow-control.fix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Updated shadow editor, hopefully fixed long-standing bugs, added ability to specify shadow's name.
|
|
@ -15,7 +15,7 @@
|
||||||
:model-value="present"
|
:model-value="present"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
class="opt"
|
class="opt"
|
||||||
@update:modelValue="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
|
@update:modelValue="update(typeof modelValue === 'undefined' ? fallback : undefined)"
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="input color-input-field"
|
class="input color-input-field"
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
type="text"
|
type="text"
|
||||||
:value="modelValue || fallback"
|
:value="modelValue || fallback"
|
||||||
:disabled="!present || disabled"
|
:disabled="!present || disabled"
|
||||||
@input="$emit('update:modelValue', $event.target.value)"
|
@input="updateValue($event.target.value)"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
v-if="validColor"
|
v-if="validColor"
|
||||||
|
@ -57,7 +57,7 @@
|
||||||
:value="modelValue || fallback"
|
:value="modelValue || fallback"
|
||||||
:disabled="!present || disabled"
|
:disabled="!present || disabled"
|
||||||
:class="{ disabled: !present || disabled }"
|
:class="{ disabled: !present || disabled }"
|
||||||
@input="$emit('update:modelValue', $event.target.value)"
|
@input="updateValue($event.target.value)"
|
||||||
>
|
>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
@ -66,6 +66,7 @@
|
||||||
<script>
|
<script>
|
||||||
import Checkbox from '../checkbox/checkbox.vue'
|
import Checkbox from '../checkbox/checkbox.vue'
|
||||||
import { hex2rgb } from '../../services/color_convert/color_convert.js'
|
import { hex2rgb } from '../../services/color_convert/color_convert.js'
|
||||||
|
import { throttle } from 'lodash'
|
||||||
|
|
||||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||||
import {
|
import {
|
||||||
|
@ -131,6 +132,11 @@ export default {
|
||||||
computedColor () {
|
computedColor () {
|
||||||
return this.modelValue && this.modelValue.startsWith('--')
|
return this.modelValue && this.modelValue.startsWith('--')
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
updateValue: throttle(function (value) {
|
||||||
|
this.$emit('update:modelValue', value)
|
||||||
|
}, 100)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -27,11 +27,6 @@
|
||||||
label.Select {
|
label.Select {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
|
||||||
&.disabled,
|
|
||||||
&:disabled {
|
|
||||||
background-color: var(--background);
|
|
||||||
}
|
|
||||||
|
|
||||||
select {
|
select {
|
||||||
appearance: none;
|
appearance: none;
|
||||||
background: transparent;
|
background: transparent;
|
||||||
|
@ -52,7 +47,7 @@ label.Select {
|
||||||
padding: 0.2em;
|
padding: 0.2em;
|
||||||
|
|
||||||
option {
|
option {
|
||||||
background: transparent;
|
background-color: transparent;
|
||||||
|
|
||||||
&.-active {
|
&.-active {
|
||||||
color: var(--selectionText);
|
color: var(--selectionText);
|
||||||
|
@ -62,6 +57,22 @@ label.Select {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.disabled,
|
||||||
|
&:disabled {
|
||||||
|
background-color: var(--background);
|
||||||
|
opacity: 1; /* override browser */
|
||||||
|
|
||||||
|
select {
|
||||||
|
&[multiple],
|
||||||
|
&[size] {
|
||||||
|
option.-active {
|
||||||
|
color: var(--text);
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.select-down-icon {
|
.select-down-icon {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
|
|
|
@ -339,7 +339,6 @@ export default {
|
||||||
return this.shadowsLocal[this.shadowSelected]
|
return this.shadowsLocal[this.shadowSelected]
|
||||||
},
|
},
|
||||||
set (v) {
|
set (v) {
|
||||||
console.log('TT', v)
|
|
||||||
this.shadowsLocal[this.shadowSelected] = v
|
this.shadowsLocal[this.shadowSelected] = v
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -4,8 +4,8 @@ import Select from 'src/components/select/select.vue'
|
||||||
import Checkbox from 'src/components/checkbox/checkbox.vue'
|
import Checkbox from 'src/components/checkbox/checkbox.vue'
|
||||||
import Popover from 'src/components/popover/popover.vue'
|
import Popover from 'src/components/popover/popover.vue'
|
||||||
import { getCssShadow, getCssShadowFilter } from '../../services/theme_data/theme_data.service.js'
|
import { getCssShadow, getCssShadowFilter } from '../../services/theme_data/theme_data.service.js'
|
||||||
import { hex2rgb } from '../../services/color_convert/color_convert.js'
|
|
||||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||||
|
import { throttle } from 'lodash'
|
||||||
import {
|
import {
|
||||||
faTimes,
|
faTimes,
|
||||||
faChevronDown,
|
faChevronDown,
|
||||||
|
@ -41,7 +41,7 @@ export default {
|
||||||
lightGrid: false,
|
lightGrid: false,
|
||||||
selectedId: 0,
|
selectedId: 0,
|
||||||
// TODO there are some bugs regarding display of array (it's not getting updated when deleting for some reason)
|
// TODO there are some bugs regarding display of array (it's not getting updated when deleting for some reason)
|
||||||
cValue: (this.modelValue || this.fallback || []).map(toModel)
|
cValue: (this.modelValue ?? this.fallback ?? []).map(toModel)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
|
@ -52,7 +52,7 @@ export default {
|
||||||
Popover
|
Popover
|
||||||
},
|
},
|
||||||
beforeUpdate () {
|
beforeUpdate () {
|
||||||
this.cValue = (this.modelValue || this.fallback || []).map(toModel)
|
this.cValue = (this.modelValue ?? this.fallback ?? []).map(toModel)
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
selected () {
|
selected () {
|
||||||
|
@ -68,12 +68,6 @@ export default {
|
||||||
shadowsAreNull () {
|
shadowsAreNull () {
|
||||||
return this.modelValue == null
|
return this.modelValue == null
|
||||||
},
|
},
|
||||||
anyShadows () {
|
|
||||||
return this.cValue.length > 0
|
|
||||||
},
|
|
||||||
anyShadowsFallback () {
|
|
||||||
return this.fallback.length > 0
|
|
||||||
},
|
|
||||||
currentFallback () {
|
currentFallback () {
|
||||||
return this.fallback?.[this.selectedId]
|
return this.fallback?.[this.selectedId]
|
||||||
},
|
},
|
||||||
|
@ -86,27 +80,28 @@ export default {
|
||||||
usingFallback () {
|
usingFallback () {
|
||||||
return this.modelValue == null
|
return this.modelValue == null
|
||||||
},
|
},
|
||||||
rgb () {
|
|
||||||
return hex2rgb(this.selected.color)
|
|
||||||
},
|
|
||||||
style () {
|
style () {
|
||||||
if (!this.ready) return {}
|
console.log(this.separateInset)
|
||||||
if (this.separateInset) {
|
if (this.separateInset) {
|
||||||
return {
|
return {
|
||||||
filter: getCssShadowFilter(this.fallback),
|
filter: getCssShadowFilter(this.cValue),
|
||||||
boxShadow: getCssShadow(this.fallback, true)
|
boxShadow: getCssShadow(this.cValue, true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
boxShadow: getCssShadow(this.fallback)
|
boxShadow: getCssShadow(this.cValue)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
updateProperty (prop, value) {
|
updateProperty: throttle(function (prop, value) {
|
||||||
|
console.log(prop, value)
|
||||||
this.cValue[this.selectedId][prop] = value
|
this.cValue[this.selectedId][prop] = value
|
||||||
|
if (prop === 'inset' && value === false && this.separateInset) {
|
||||||
|
this.cValue[this.selectedId].spread = 0
|
||||||
|
}
|
||||||
this.$emit('update:modelValue', this.cValue)
|
this.$emit('update:modelValue', this.cValue)
|
||||||
},
|
}, 100),
|
||||||
add () {
|
add () {
|
||||||
this.cValue.push(toModel(this.selected))
|
this.cValue.push(toModel(this.selected))
|
||||||
this.selectedId = Math.max(this.cValue.length - 1, 0)
|
this.selectedId = Math.max(this.cValue.length - 1, 0)
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-auto-columns: 1fr;
|
grid-auto-columns: 1fr;
|
||||||
grid-auto-flow: column;
|
grid-auto-flow: column;
|
||||||
grid-gap: 0.125em;
|
|
||||||
margin-top: 0.25em;
|
margin-top: 0.25em;
|
||||||
|
|
||||||
.button-default {
|
.button-default {
|
||||||
|
|
|
@ -56,7 +56,7 @@
|
||||||
@input="e => updateProperty('x', e.target.value)"
|
@input="e => updateProperty('x', e.target.value)"
|
||||||
>
|
>
|
||||||
<Checkbox
|
<Checkbox
|
||||||
id="inset"
|
id="lightGrid"
|
||||||
v-model="lightGrid"
|
v-model="lightGrid"
|
||||||
:disabled="!present"
|
:disabled="!present"
|
||||||
name="lightGrid"
|
name="lightGrid"
|
||||||
|
@ -83,7 +83,7 @@
|
||||||
</option>
|
</option>
|
||||||
</Select>
|
</Select>
|
||||||
<div
|
<div
|
||||||
class="id-control arrange-buttons"
|
class="id-control btn-group arrange-buttons"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
class="btn button-default"
|
class="btn button-default"
|
||||||
|
@ -132,12 +132,11 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="shadow-tweak">
|
<div class="shadow-tweak">
|
||||||
<div
|
<div
|
||||||
:disabled="!present"
|
|
||||||
:class="{ disabled: !present }"
|
:class="{ disabled: !present }"
|
||||||
class="name-control style-control"
|
class="name-control style-control"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
for="spread"
|
for="name"
|
||||||
class="label"
|
class="label"
|
||||||
:class="{ faint: !present }"
|
:class="{ faint: !present }"
|
||||||
>
|
>
|
||||||
|
@ -163,7 +162,7 @@
|
||||||
:disabled="!present"
|
:disabled="!present"
|
||||||
name="inset"
|
name="inset"
|
||||||
class="input-inset input-boolean"
|
class="input-inset input-boolean"
|
||||||
@input="e => updateProperty('inset', e.target.value)"
|
@input="e => updateProperty('inset', e.target.checked)"
|
||||||
>
|
>
|
||||||
<template #before>
|
<template #before>
|
||||||
{{ $t('settings.style.shadows.inset') }}
|
{{ $t('settings.style.shadows.inset') }}
|
||||||
|
@ -176,7 +175,7 @@
|
||||||
class="blur-control style-control"
|
class="blur-control style-control"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
for="spread"
|
for="blur"
|
||||||
class="label"
|
class="label"
|
||||||
:class="{ faint: !present }"
|
:class="{ faint: !present }"
|
||||||
>
|
>
|
||||||
|
@ -205,22 +204,21 @@
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
:disabled="!present"
|
|
||||||
class="spread-control style-control"
|
class="spread-control style-control"
|
||||||
:class="{ disabled: !present }"
|
:class="{ disabled: !present || (separateInset && !selected?.inset) }"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
for="spread"
|
for="spread"
|
||||||
class="label"
|
class="label"
|
||||||
:class="{ faint: !present }"
|
:class="{ faint: !present || (separateInset && !selected?.inset) }"
|
||||||
>
|
>
|
||||||
{{ $t('settings.style.shadows.spread') }}
|
{{ $t('settings.style.shadows.spread') }}
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
id="spread"
|
id="spread"
|
||||||
:value="selected?.spread"
|
:value="selected?.spread"
|
||||||
:disabled="!present"
|
:disabled="!present || (separateInset && !selected?.inset)"
|
||||||
:class="{ disabled: !present }"
|
:class="{ disabled: !present || (separateInset && !selected?.inset) }"
|
||||||
name="spread"
|
name="spread"
|
||||||
class="input input-range"
|
class="input input-range"
|
||||||
type="range"
|
type="range"
|
||||||
|
@ -230,26 +228,26 @@
|
||||||
>
|
>
|
||||||
<input
|
<input
|
||||||
:value="selected?.spread"
|
:value="selected?.spread"
|
||||||
:disabled="!present"
|
:disabled="{ disabled: !present || (separateInset && !selected?.inset) }"
|
||||||
:class="{ disabled: !present }"
|
:class="{ disabled: !present || (separateInset && !selected?.inset) }"
|
||||||
class="input input-number"
|
class="input input-number"
|
||||||
type="number"
|
type="number"
|
||||||
@input="e => updateProperty('spread', e.target.value)"
|
@input="e => updateProperty('spread', e.target.value)"
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<ColorInput
|
<ColorInput
|
||||||
:modelValue="selected?.color"
|
:model-value="selected?.color"
|
||||||
:disabled="!present"
|
:disabled="!present"
|
||||||
:label="$t('settings.style.common.color')"
|
:label="$t('settings.style.common.color')"
|
||||||
:fallback="currentFallback?.color"
|
:fallback="currentFallback?.color"
|
||||||
:show-optional-tickbox="false"
|
:show-optional-tickbox="false"
|
||||||
name="shadow"
|
name="shadow"
|
||||||
@update:modelValue="e => updateProperty('color', e.target.value)"
|
@update:modelValue="e => updateProperty('color', e)"
|
||||||
/>
|
/>
|
||||||
<OpacityInput
|
<OpacityInput
|
||||||
:modelValue="selected?.alpha"
|
:model-value="selected?.alpha"
|
||||||
:disabled="!present"
|
:disabled="!present"
|
||||||
@update:modelValue="e => updateProperty('alpha', e.target.value)"
|
@update:modelValue="e => updateProperty('alpha', e)"
|
||||||
/>
|
/>
|
||||||
<i18n-t
|
<i18n-t
|
||||||
scope="global"
|
scope="global"
|
||||||
|
@ -260,8 +258,8 @@
|
||||||
<code>--variable,mod</code>
|
<code>--variable,mod</code>
|
||||||
</i18n-t>
|
</i18n-t>
|
||||||
<Popover
|
<Popover
|
||||||
trigger="hover"
|
|
||||||
v-if="separateInset"
|
v-if="separateInset"
|
||||||
|
trigger="hover"
|
||||||
>
|
>
|
||||||
<template #trigger>
|
<template #trigger>
|
||||||
<div
|
<div
|
||||||
|
|
Loading…
Reference in a new issue