diff --git a/frontend/src/components/Details/Info/MediaCarousel.vue b/frontend/src/components/Details/Info/MediaCarousel.vue index 920a1029a..b9e6c534b 100644 --- a/frontend/src/components/Details/Info/MediaCarousel.vue +++ b/frontend/src/components/Details/Info/MediaCarousel.vue @@ -26,21 +26,15 @@ const localVideoPath = computed(() => { }); const screenshots = computed(() => props.rom.merged_screenshots); const mediaPaths = computed(() => { + const ss = props.rom.ss_metadata; + const gamelist = props.rom.gamelist_metadata; return { - box3d_path: - props.rom.ss_metadata?.box3d_path || - props.rom.gamelist_metadata?.box3d_path, - physical_path: - props.rom.ss_metadata?.physical_path || - props.rom.gamelist_metadata?.physical_path, - miximage_path: - props.rom.ss_metadata?.miximage_path || - props.rom.gamelist_metadata?.miximage_path, - marquee_path: - props.rom.ss_metadata?.marquee_path || - props.rom.gamelist_metadata?.marquee_path, - logo_path: props.rom.ss_metadata?.logo_path, - bezel_path: props.rom.ss_metadata?.bezel_path, + box3d_path: ss?.box3d_path || gamelist?.box3d_path, + physical_path: ss?.physical_path || gamelist?.physical_path, + miximage_path: ss?.miximage_path || gamelist?.miximage_path, + marquee_path: ss?.marquee_path || gamelist?.marquee_path, + logo_path: ss?.logo_path, + bezel_path: ss?.bezel_path, }; }); diff --git a/frontend/src/components/Settings/UserInterface/Interface.vue b/frontend/src/components/Settings/UserInterface/Interface.vue index 0705ce045..6b4437a90 100644 --- a/frontend/src/components/Settings/UserInterface/Interface.vue +++ b/frontend/src/components/Settings/UserInterface/Interface.vue @@ -138,6 +138,30 @@ const galleryOptions = computed(() => [ disabled: !groupRomsRef, modelTrigger: toggleSiblings, }, + { + title: t("settings.show-game-titles"), + description: t("settings.show-game-titles-desc"), + iconEnabled: "mdi-subtitles", + iconDisabled: "mdi-subtitles-outline", + model: gameTitleRef, + modelTrigger: toggleShowGameTitles, + }, + { + title: t("settings.show-actionbar"), + description: t("settings.show-actionbar-desc"), + iconEnabled: "mdi-card", + iconDisabled: "mdi-card-outline", + model: actionBarRef, + modelTrigger: toggleActionBar, + }, + { + title: t("settings.show-status"), + description: t("settings.show-status-desc"), + iconEnabled: "mdi-check-circle-outline", + iconDisabled: "mdi-close-circle-outline", + model: statusRef, + modelTrigger: toggleStatus, + }, { title: t("settings.show-regions"), description: t("settings.show-regions-desc"), @@ -154,22 +178,6 @@ const galleryOptions = computed(() => [ model: languagesRef, modelTrigger: toggleLanguages, }, - { - title: t("settings.show-status"), - description: t("settings.show-status-desc"), - iconEnabled: "mdi-check-circle-outline", - iconDisabled: "mdi-close-circle-outline", - model: statusRef, - modelTrigger: toggleStatus, - }, - { - title: t("settings.show-actionbar"), - description: t("settings.show-actionbar-desc"), - iconEnabled: "mdi-card", - iconDisabled: "mdi-card-outline", - model: actionBarRef, - modelTrigger: toggleActionBar, - }, { title: t("settings.enable-3d-effect"), description: t("settings.enable-3d-effect-desc"), @@ -179,12 +187,12 @@ const galleryOptions = computed(() => [ modelTrigger: toggle3DEffect, }, { - title: t("settings.show-game-titles"), - description: t("settings.show-game-titles-desc"), - iconEnabled: "mdi-subtitles", - iconDisabled: "mdi-subtitles-outline", - model: gameTitleRef, - modelTrigger: toggleShowGameTitles, + title: t("settings.disable-animations"), + description: t("settings.disable-animations-desc"), + iconEnabled: "mdi-motion-pause", + iconDisabled: "mdi-motion-play", + model: disableAnimationsRef, + modelTrigger: toggleDisableAnimations, }, { title: t("settings.enable-experimental-cache"), @@ -194,14 +202,6 @@ const galleryOptions = computed(() => [ model: enableExperimentalCacheRef, modelTrigger: toggleExperimentalCache, }, - { - title: t("settings.disable-animations"), - description: t("settings.disable-animations-desc"), - iconEnabled: "mdi-motion-pause", - iconDisabled: "mdi-motion-play", - model: disableAnimationsRef, - modelTrigger: toggleDisableAnimations, - }, ]); const boxartStyleOptions = computed(() => [ @@ -314,7 +314,7 @@ const toggleDisableAnimations = (value: boolean) => { -import { storeToRefs } from "pinia"; import VanillaTilt from "vanilla-tilt"; import { computed,