Fix: limit ornament icon-swapping behavior to armor (#11665)

* Fix: limit ornament icon-swapping behavior to armor

* Use new i18n keys for ornament explanation

Retain the old keys

* Revise so that ornaments can still be toggled off for weapons instead of only armor, with hover behavior restricted to armor

* Update behavior so setting off = no hover behavior

Author: FlaminSarge

config/i18n.json

@@ -1259,6 +1259,8 @@
     "MaxParallelCores": "Maximum cores for parallel tasks",
     "MaxParallelCoresExplanation": "Controls how many CPU cores DIM can use for intensive tasks like Loadout Optimizer and Loadout Analyzer. Higher values may improve performance but use more system resources.",
     "OrnamentDisplay": "Show Ornaments on item tiles",
+    "OrnamentDisplayExplanationDisabled": "Items will never display their ornaments",
+    "OrnamentDisplayExplanationEnabled": "Hovering or long-pressing armor will hide its ornament",
     "OrnamentDisplayExplanationHide": "Hovering or long-pressing an item will hide its ornament",
     "OrnamentDisplayExplanationShow": "Hovering or long-pressing an item will show its ornament",
     "ResetToDefault": "Reset",

src/app/inventory/ItemIcon.m.scss

@@ -97,9 +97,9 @@ $commonBg: #366f42;
       content-visibility 0.2s allow-discrete;
   }
 
-  :global(.item):hover & {
-    opacity: var(--ornament-display-opacity, 1);
-    content-visibility: var(--ornament-display-visibility, auto);
+  :global(.item):hover &.isArmor {
+    opacity: 1;
+    content-visibility: auto;
   }
 }
 
@@ -114,9 +114,9 @@ $commonBg: #366f42;
       content-visibility 0.2s allow-discrete;
   }
 
-  :global(.item):hover & {
-    opacity: calc(1 - var(--ornament-display-opacity, 1));
-    content-visibility: var(--ornament-display-visibility-inverse, hidden);
+  :global(.item):hover &.isArmor {
+    opacity: 0;
+    content-visibility: hidden;
   }
 }
 

src/app/inventory/ItemIcon.m.scss.d.ts

@@ -180,10 +180,18 @@ export default function ItemIcon({ item, className }: { item: DimItem; className
           {foreground && (
             <div
               style={bungieBackgroundStyle(foreground)}
-              className={clsx({ [styles.hasAltIcon]: Boolean(altIcon) })}
+              className={clsx({
+                [styles.hasAltIcon]: Boolean(altIcon),
+                [styles.isArmor]: item.bucket.inArmor,
+              })}
+            />
+          )}
+          {altIcon && (
+            <div
+              style={bungieBackgroundStyle(altIcon)}
+              className={clsx({ [styles.altIcon]: true, [styles.isArmor]: item.bucket.inArmor })}
             />
           )}
-          {altIcon && <div style={bungieBackgroundStyle(altIcon)} className={styles.altIcon} />}
           {masterworkGlow && (
             <div style={bungieBackgroundStyle(masterworkGlow)} className={styles.adjustOpacity} />
           )}

src/app/inventory/ItemIcon.tsx

@@ -60,6 +60,10 @@ const themeOptions = mapToOptions({
   vexnet: 'Vex Network',
 });
 
+// Old ornament setting; keeping these strings from being culled
+// t('Settings.OrnamentDisplayExplanationHide')
+// t('Settings.OrnamentDisplayExplanationShow')
+
 export default function SettingsPage() {
   usePageTitle(t('Settings.Settings'));
   const dispatch = useThunkDispatch();
@@ -526,8 +530,8 @@ export default function SettingsPage() {
               />
               <div className={styles.fineprint}>
                 {settings.ornamentDisplay === OrnamentDisplay.All
-                  ? t('Settings.OrnamentDisplayExplanationHide')
-                  : t('Settings.OrnamentDisplayExplanationShow')}
+                  ? t('Settings.OrnamentDisplayExplanationEnabled')
+                  : t('Settings.OrnamentDisplayExplanationDisabled')}
               </div>
             </div>
 

src/app/settings/SettingsPage.tsx

@@ -1242,6 +1242,8 @@
     "MaxParallelCores": "Maximum cores for parallel tasks",
     "MaxParallelCoresExplanation": "Controls how many CPU cores DIM can use for intensive tasks like Loadout Optimizer and Loadout Analyzer. Higher values may improve performance but use more system resources.",
     "OrnamentDisplay": "Show Ornaments on item tiles",
+    "OrnamentDisplayExplanationDisabled": "Items will never display their ornaments",
+    "OrnamentDisplayExplanationEnabled": "Hovering or long-pressing armor will hide its ornament",
     "OrnamentDisplayExplanationHide": "Hovering or long-pressing an item will hide its ornament",
     "OrnamentDisplayExplanationShow": "Hovering or long-pressing an item will show its ornament",
     "ResetToDefault": "Reset",