Merge branch 'themes3-grand-finale-maybe' into shigusegubu-themes3

src/components/select/select_motion.vue

@@ -49,9 +49,27 @@
 </template>
 
 <script setup>
-import { computed, defineEmits, defineProps } from 'vue'
+import { computed, defineEmits, defineProps, nextTick } from 'vue'
+
+const props = defineProps({
+  modelValue: {
+    type: Array,
+    required: true
+  },
+  selectedId: {
+    type: Number,
+    required: true
+  },
+  disabled: {
+    type: Boolean,
+    default: false
+  },
+  getAddValue: {
+    type: Function,
+    required: true
+  }
+})
 
-const props = defineProps(['modelValue', 'selectedId', 'disabled', 'getAddValue'])
 const emit = defineEmits(['update:modelValue', 'update:selectedId'])
 
 const moveUpValid = computed(() => {
@@ -60,12 +78,13 @@ const moveUpValid = computed(() => {
 
 const present = computed(() => props.modelValue[props.selectedId] != null)
 
-const moveUp = () => {
+const moveUp = async () => {
   const newModel = [...props.modelValue]
   const movable = newModel.splice(props.selectedId, 1)[0]
   newModel.splice(props.selectedId - 1, 0, movable)
 
   emit('update:modelValue', newModel)
+  await nextTick()
   emit('update:selectedId', props.selectedId - 1)
 }
 
@@ -73,27 +92,30 @@ const moveDnValid = computed(() => {
   return props.selectedId < props.modelValue.length - 1
 })
 
-const moveDn = () => {
+const moveDn = async () => {
   const newModel = [...props.modelValue]
   const movable = newModel.splice(props.selectedId.value, 1)[0]
   newModel.splice(props.selectedId + 1, 0, movable)
 
   emit('update:modelValue', newModel)
+  await nextTick()
   emit('update:selectedId', props.selectedId + 1)
 }
 
-const add = () => {
+const add = async () => {
   const newModel = [...props.modelValue, props.getAddValue()]
 
   emit('update:modelValue', newModel)
+  await nextTick()
   emit('update:selectedId', Math.max(newModel.length - 1, 0))
 }
 
-const del = () => {
+const del = async () => {
   const newModel = [...props.modelValue]
   newModel.splice(props.selectedId, 1)
 
   emit('update:modelValue', newModel)
+  await nextTick()
   emit('update:selectedId', newModel.length === 0 ? undefined : Math.max(props.selectedId - 1, 0))
 }
 </script>

src/components/settings_modal/tabs/style_tab/style_tab.js

@@ -391,6 +391,7 @@ export default {
             return deserializeShadow(shadow)
           } catch (e) {
             console.warn(e)
+            return shadow
           }
         }
         return null
@@ -703,7 +704,6 @@ export default {
       if (selectedState.size > 0) {
         selectedState.forEach(state => {
           const original = selectedComponent.value.states[state]
-          console.log('ORIG', original)
           selectors.push(simulatePseudoSelectors(original))
         })
       }

src/components/settings_modal/tabs/style_tab/virtual_directives_tab.vue

@@ -1,83 +1,83 @@
 <script src="./virtual_directives_tab.js"></script>
 
 <template>
-<div class="setting-item list-editor variables-editor">
-  <label
-    class="list-select-label"
-    for="variables-selector"
-  >
-    {{ $t('settings.style.themes3.editor.variables.label') }}
-    {{ ' ' }}
-  </label>
-  <Select
-    id="variables-selector"
-    v-model="selectedVirtualDirectiveId"
-    class="list-select"
-    size="20"
+  <div class="setting-item list-editor variables-editor">
+    <label
+      class="list-select-label"
+      for="variables-selector"
     >
-    <option
-      v-for="(p, index) in modelValue"
-      :key="p.name"
-      :value="index"
+      {{ $t('settings.style.themes3.editor.variables.label') }}
+      {{ ' ' }}
+    </label>
+    <Select
+      id="variables-selector"
+      v-model="selectedVirtualDirectiveId"
+      class="list-select"
+      size="20"
       >
-      {{ p.name }}
-    </option>
-  </Select>
-  <SelectMotion
-    class="list-select-movement"
-    :model-value="modelValue"
-    @update:modelValue="e => emit('update:modelValue', e)"
-    :selected-id="selectedVirtualDirectiveId"
-    @update:selectedId="e => selectedVirtualDirectiveId = e"
-    :get-add-value="getNewVirtualDirective"
-  />
-  <div class="list-edit-area">
-    <div class="variable-selector">
-      <label
-        class="variable-name-label"
-        for="variables-selector"
-      >
-        {{ $t('settings.style.themes3.editor.variables.name_label') }}
-        {{ ' ' }}
-      </label>
-      <input
-        class="input"
-        v-model="selectedVirtualDirective.name"
-      >
-      <label
-        class="variable-type-label"
-        for="variables-selector"
+      <option
+        v-for="(p, index) in modelValue"
+        :key="p.name"
+        :value="index"
         >
-        {{ $t('settings.style.themes3.editor.variables.type_label') }}
-        {{ ' ' }}
-      </label>
-      <Select
-        v-model="selectedVirtualDirectiveValType"
-      >
-        <option value='shadow'>
-          {{ $t('settings.style.themes3.editor.variables.type_shadow') }}
-        </option>
-        <option value='color'>
-          {{ $t('settings.style.themes3.editor.variables.type_color') }}
-        </option>
-        <option value='generic'>
-          {{ $t('settings.style.themes3.editor.variables.type_generic') }}
-        </option>
-      </Select>
+        {{ p.name }}
+      </option>
+    </Select>
+    <SelectMotion
+      class="list-select-movement"
+      :model-value="modelValue"
+      @update:modelValue="e => emit('update:modelValue', e)"
+      :selected-id="selectedVirtualDirectiveId"
+      @update:selectedId="e => selectedVirtualDirectiveId = e"
+      :get-add-value="getNewVirtualDirective"
+    />
+    <div class="list-edit-area">
+      <div class="variable-selector">
+        <label
+          class="variable-name-label"
+          for="variables-selector"
+        >
+          {{ $t('settings.style.themes3.editor.variables.name_label') }}
+          {{ ' ' }}
+        </label>
+        <input
+          class="input"
+          v-model="selectedVirtualDirective.name"
+        >
+        <label
+          class="variable-type-label"
+          for="variables-selector"
+          >
+          {{ $t('settings.style.themes3.editor.variables.type_label') }}
+          {{ ' ' }}
+        </label>
+        <Select
+          v-model="selectedVirtualDirectiveValType"
+        >
+          <option value='shadow'>
+            {{ $t('settings.style.themes3.editor.variables.type_shadow') }}
+          </option>
+          <option value='color'>
+            {{ $t('settings.style.themes3.editor.variables.type_color') }}
+          </option>
+          <option value='generic'>
+            {{ $t('settings.style.themes3.editor.variables.type_generic') }}
+          </option>
+        </Select>
+      </div>
+      <ShadowControl
+        v-if="selectedVirtualDirectiveValType === 'shadow'"
+        v-model="draftVirtualDirective"
+        :static-vars="staticVars"
+        :compact="true"
+      />
+      <ColorInput
+        v-if="selectedVirtualDirectiveValType === 'color'"
+        v-model="draftVirtualDirective"
+        :fallback="computeColor(draftVirtualDirective)"
+        :label="$t('settings.style.themes3.editor.variables.virtual_color')"
+        :hide-optional-checkbox="true"
+      />
     </div>
-    <ShadowControl
-      v-if="selectedVirtualDirectiveValType === 'shadow'"
-      v-model="draftVirtualDirective"
-      :static-vars="staticVars"
-      :compact="true"
-    />
-    <ColorInput
-      v-if="selectedVirtualDirectiveValType === 'color'"
-      v-model="draftVirtualDirective"
-      :fallback="computeColor(draftVirtualDirective)"
-      :label="$t('settings.style.themes3.editor.variables.virtual_color')"
-      :hide-optional-checkbox="true"
-    />
   </div>
-</div>
 </template>

src/services/theme_data/theme3_slot_functions.js

@@ -23,6 +23,16 @@ export const colorFunctions = {
       return { ...colorArg, a: amount }
     }
   },
+  brightness: {
+    argsNeeded: 2,
+    exec: (args, { findColor }, { dynamicVars, staticVars }) => {
+      const [color, amountArg] = args
+
+      const colorArg = convert(findColor(color, { dynamicVars, staticVars })).hsl
+      colorArg.l += Number(amountArg)
+      return { ...convert(colorArg).rgb }
+    }
+  },
   textColor: {
     argsNeeded: 2,
     exec: (args, { findColor }, { dynamicVars, staticVars }) => {

src/services/theme_data/theme_data_3.service.js

@@ -518,7 +518,7 @@ export const init = ({
       combination.component = component.name
       combination.lazy = component.lazy || parent?.lazy
       combination.parent = parent
-      if (combination.state.indexOf('hover') >= 0) {
+      if (!liteMode && combination.state.indexOf('hover') >= 0) {
         combination.lazy = true
       }