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

Author: FlaminSarge

config/i18n.json

@@ -1259,7 +1259,7 @@
     "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",
+    "OrnamentDisplayExplanationDisabled": "Hovering or long-pressing armor will show its ornament",
     "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",

src/app/inventory/ItemIcon.m.scss

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

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

@@ -116,11 +116,7 @@ export default function ItemIcon({ item, className }: { item: DimItem; className
   let foreground = (item.iconDef?.foreground ?? item.icon) || '';
   let altIcon = '';
   if (item.ornamentIconDef) {
-    if (item.bucket.inArmor) {
-      altIcon = item.ornamentIconDef.foreground;
-    } else {
-      foreground = item.ornamentIconDef.foreground;
-    }
+    altIcon = item.ornamentIconDef.foreground;
   }
 
   if (!animatedBackground && !altIcon) {
@@ -184,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

@@ -1242,7 +1242,7 @@
     "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",
+    "OrnamentDisplayExplanationDisabled": "Hovering or long-pressing armor will show its ornament",
     "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",