Skip to content

Commit

Permalink
Removed glow under main menu options, see #5109
Browse files Browse the repository at this point in the history
  • Loading branch information
MollyMaclachlan committed Jan 12, 2025
1 parent f8c6c66 commit 442c7c2
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/guiengine/skin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1400,6 +1400,7 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget,
else
{
bool use_glow = true;
bool use_square = true;

if (widget->m_event_handler != NULL &&
widget->m_event_handler->m_properties[PROP_SQUARE] == "true")
Expand All @@ -1409,6 +1410,11 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget,
widget->m_event_handler->m_event_handler
->m_properties[PROP_SQUARE] == "true")
use_glow = false;
if (widget->m_properties[PROP_FOCUS_ICON].size() > 0)
{
use_glow = false;
use_square = false;
}

/* in combo ribbons, always show selection */
RibbonWidget* parentRibbonWidget = NULL;
Expand Down Expand Up @@ -1601,7 +1607,7 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget,
/*alpha*/true);
}
// if we're not using glow, draw square focus instead
else
else if (use_square)
{
drawBoxFromStretchableTexture(parentRibbonWidget, rect,
SkinConfig::m_render_params["squareFocusHalo1::neutral"]);
Expand Down

0 comments on commit 442c7c2

Please sign in to comment.