Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chainrez merged 4 commits into from
Jan 3, 2026
+27 −10
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e007bd7
Fix: limit ornament icon-swapping behavior to armor
FlaminSarge Jan 2, 2026
443f0fb
Use new i18n keys for ornament explanation
FlaminSarge Jan 2, 2026
b20f097
Revise so that ornaments can still be toggled off for weapons instead…
FlaminSarge Jan 3, 2026
7676c30
Update behavior so setting off = no hover behavior
FlaminSarge Jan 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions src/app/inventory/ItemIcon.m.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand All @@ -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;
}
}

Expand Down
1 change: 1 addition & 0 deletions src/app/inventory/ItemIcon.m.scss.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions src/app/inventory/ItemIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} />
)}
Expand Down
8 changes: 6 additions & 2 deletions src/app/settings/SettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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>

Expand Down
2 changes: 2 additions & 0 deletions src/locale/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down