Skip to content

Commit 4f87134

Browse files
committed
fix hover theme inheritance
1 parent 68f9770 commit 4f87134

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/java/com/cleanroommc/modularui/theme/ThemeManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,22 +320,22 @@ private <T extends WidgetTheme> void parse(WidgetThemeMap map, ITheme parent, Wi
320320
}
321321
// we still need to parse not inherited values (fallback)
322322
widgetThemeJson = emptyJson;
323+
widgetThemeHoverJson = emptyJson;
323324
}
324325
}
325326

326327
JsonObject fallback = key.isSubWidgetTheme() ? null : json.getJson();
327328
T widgetTheme = null;
328329
if (widgetThemeJson != null) {
329-
// widget theme defined
330330
T parentWidgetTheme = key.isSubWidgetTheme() ? map.getTheme(key.getParent()).getTheme() : parent.getWidgetTheme(key).getTheme();
331331
// sub widget themes strictly only inherit from their parent widget theme and not the parent theme
332332
widgetTheme = parser.parse(parentWidgetTheme, widgetThemeJson, fallback);
333333
}
334334

335335
T widgetThemeHover = null;
336336
if (widgetThemeHoverJson != null) {
337-
// hover widget theme defined
338-
T parentWidgetTheme = widgetTheme != null ? widgetTheme : parent.getWidgetTheme(key).getHoverTheme();
337+
// only inherit from the widget theme if it was actually defined, otherwise use parent
338+
T parentWidgetTheme = definedInTheme ? widgetTheme : parent.getWidgetTheme(key).getHoverTheme();
339339
widgetThemeHover = parser.parse(parentWidgetTheme, widgetThemeHoverJson, fallback);
340340
}
341341

0 commit comments

Comments
 (0)