fix: Make mod item grey when it's disabled

Voxelum · Oct 19, 2023 · b952432 · b952432
1 parent fca73fd
commit b952432
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 21 deletions.
diff --git a/xmcl-keystone-ui/src/composables/modSearch.ts b/xmcl-keystone-ui/src/composables/modSearch.ts
@@ -229,13 +229,15 @@ export function useLocalModsSearch(keyword: Ref<string>, modLoaderFilters: Ref<M
         obj.files?.push(m)
         if (instanceFile) {
           obj.installed?.push(m)
+          obj.disabled = !obj.installed[0].enabled
         }
       } else {
         const mod: Mod = markRaw({
           id: name,
           author: m.authors[0] ?? '',
           icon: m.icon,
           title: name,
+          disabled: false,
           description: m.description,
           forge: m.modLoaders.indexOf('forge') !== -1,
           fabric: m.modLoaders.indexOf('fabric') !== -1,
@@ -258,6 +260,7 @@ export function useLocalModsSearch(keyword: Ref<string>, modLoaderFilters: Ref<M
         }
         if (instanceFile) {
           mod.installed.push(m)
+          mod.disabled = !mod.installed[0].enabled
         }
         return mod
       }

diff --git a/xmcl-keystone-ui/src/util/mod.ts b/xmcl-keystone-ui/src/util/mod.ts
@@ -103,6 +103,8 @@ export interface Mod {
   description: string
   author: string
 
+  disabled?: boolean
+
   downloadCount?: number
   followerCount?: number
 

diff --git a/xmcl-keystone-ui/src/views/Mod.vue b/xmcl-keystone-ui/src/views/Mod.vue
@@ -61,23 +61,6 @@
                 {{ t('modInstall.upgrade') }}
               </span>
             </v-btn>
-            <!-- <v-divider
-              vertical
-              class="mx-2"
-            /> -->
-            <!-- <span class="search-text">
-              {{ t('modInstall.search') }}
-            </span>
-            <span
-              v-if="counts.searched > 0"
-              class="ml-2"
-            >
-              {{ t('items.count', { count: counts.searched }) }}
-              <span v-if="total">
-                /
-                {{ t('items.total', { total: total }) }}
-              </span>
-            </span> -->
           </v-subheader>
         </div>
         <v-virtual-scroll
@@ -216,17 +199,13 @@ const { minecraft } = injection(kInstanceVersion)
 const { runtime } = injection(kInstance)
 const { provideRuntime } = injection(kInstanceModsContext)
 
-watch(provideRuntime, v => console.log(v), { immediate: true })
-
 const {
   modrinth, modrinthError,
   curseforge, curseforgeError,
   loading,
   loadMoreCurseforge,
   loadMoreModrinth,
   keyword,
-  loadingCurseforge,
-  loadingModrinth,
 } = injection(kModsSearch)
 const { search, installed, tab } = injection(kMods)
 

diff --git a/xmcl-keystone-ui/src/views/ModItem.vue b/xmcl-keystone-ui/src/views/ModItem.vue
@@ -2,6 +2,10 @@
   <v-list-item
     v-context-menu="getContextMenuItems"
     v-shared-tooltip="[tooltip, hasUpdate ? 'primary' : 'black']"
+    class="pointer-events-auto"
+    :class="{
+      'v-list-item--disabled': item.disabled
+    }"
     :input-value="selected"
     link
     @click="emit('click')"
@@ -51,6 +55,7 @@
       <v-list-item-subtitle class="invisible-scroll flex flex-grow-0 gap-2">
         <template v-if="item.installed && (item.installed?.[0]?.tags.length + compatibility.length) > 0">
           <ModLabels
+            :disabled="item.disabled"
             :compatibility="compatibility"
             :tags="item.installed[0].tags"
           />

diff --git a/xmcl-keystone-ui/src/views/ModLabels.vue b/xmcl-keystone-ui/src/views/ModLabels.vue
@@ -10,6 +10,7 @@
       class="mod-tag"
       :outlined="darkTheme"
       color="orange en-1"
+      :disabled="disabled"
       label
       style="margin-left: 1px;"
       @mousedown.stop
@@ -21,6 +22,7 @@
       :key="com.modId + ' ' + i"
       v-shared-tooltip="getTooltip(com)"
       class="mod-tag"
+      :disabled="disabled"
       small
       label
       outlined
@@ -48,6 +50,7 @@
       class="mod-tag"
       small
       label
+      :disabled="disabled"
       :color="getColor(tag)"
       style="margin-left: 1px;"
       close
@@ -79,6 +82,7 @@ import { kInstanceModsContext } from '@/composables/instanceMods'
 const props = defineProps<{
   modid?: string
   tags: string[]
+  disabled?: boolean
   compatibility: CompatibleDetail[]
 }>()