gui: fix breaking changes with themeing
This commit is contained in:
@@ -681,11 +681,17 @@ namespace wi::gui
|
||||
theme.image.Apply(sprites[id].params);
|
||||
}
|
||||
theme.font.Apply(font.params);
|
||||
SetShadowRadius(theme.shadow);
|
||||
if (theme.shadow >= 0)
|
||||
{
|
||||
SetShadowRadius(theme.shadow);
|
||||
}
|
||||
SetShadowColor(theme.shadow_color);
|
||||
theme.tooltipFont.Apply(tooltipFont.params);
|
||||
theme.tooltipImage.Apply(tooltipSprite.params);
|
||||
tooltip_shadow = theme.tooltip_shadow;
|
||||
if (theme.tooltip_shadow >= 0)
|
||||
{
|
||||
tooltip_shadow = theme.tooltip_shadow;
|
||||
}
|
||||
tooltip_shadow_color = theme.tooltip_shadow_color;
|
||||
shadow_highlight = theme.shadow_highlight;
|
||||
shadow_highlight_color = theme.shadow_highlight_color;
|
||||
|
||||
@@ -210,7 +210,7 @@ namespace wi::gui
|
||||
}
|
||||
} font;
|
||||
|
||||
float shadow = 1; // shadow radius
|
||||
float shadow = -1; // shadow radius, if less than 0, it won't be used to override
|
||||
wi::Color shadow_color = wi::Color::Shadow(); // shadow color for whole widget
|
||||
bool shadow_highlight = false;
|
||||
XMFLOAT3 shadow_highlight_color = XMFLOAT3(1, 1, 1);
|
||||
@@ -218,7 +218,7 @@ namespace wi::gui
|
||||
|
||||
Image tooltipImage;
|
||||
Font tooltipFont;
|
||||
float tooltip_shadow = 1; // shadow radius
|
||||
float tooltip_shadow = -1; // shadow radius, if less than 0, it won't be used to override
|
||||
wi::Color tooltip_shadow_color = wi::Color::Shadow();
|
||||
};
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace wi::version
|
||||
// minor features, major updates, breaking compatibility changes
|
||||
const int minor = 71;
|
||||
// minor bug fixes, alterations, refactors, updates
|
||||
const int revision = 690;
|
||||
const int revision = 691;
|
||||
|
||||
const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user