Merge branch 'master' of https://ghproxy.net/https://github.com/Molly…

…Maclachlan/stk-code into 1.5
supertuxkart · Jan 17, 2025 · 3020642 · 3020642
2 parents 96b575a + 025aa7d
commit 3020642
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
@@ -1424,10 +1424,11 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget,
         }
 
         const bool mark_focused =
-            focused || (parent_focused && parentRibbonWidget != NULL &&
+            (focused || (parent_focused && parentRibbonWidget != NULL &&
                           parentRibbonWidget->m_mouse_focus == widget) ||
                        (mark_selected && !always_show_selection &&
-                          parent_focused);
+                          parent_focused)) &&
+                        widget->m_properties[PROP_FOCUS_ICON].size() == 0;
 
         /* draw "selection bubble" if relevant */
         if (always_show_selection && mark_selected)