Fix #5127

Author: CodingJellyfish

src/guiengine/skin.cpp

@@ -1475,69 +1475,24 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget,
             }
         }
 
+        // Handle focus from players
 
-        //Handle drawing for the first player
         int nPlayersOnThisItem = 0;
 
         if (mark_focused)
         {
-            if (use_glow)
-            {
-                // don't mark filler items as focused
-                if (widget->m_properties[PROP_ID] == RibbonWidget::NO_ITEM_ID)
-                    return;
-
-                static float glow_effect = 0;
-
-                const float dt = GUIEngine::getLatestDt();
-                glow_effect += dt * 3;
-                if (glow_effect > 6.2832f /* 2*PI */) glow_effect -= 6.2832f;
-                float grow = 10.0f * sinf(glow_effect);
-
-                const int glow_center_x = rect.UpperLeftCorner.X
-                    + rect.getWidth() / 2;
-                const int glow_center_y = rect.LowerRightCorner.Y;
-
-                ITexture* tex_ficonhighlight =
-                    SkinConfig::m_render_params["focusHalo::neutral"]
-                    .getImage();
-                const int texture_w = tex_ficonhighlight->getSize().Width;
-                const int texture_h = tex_ficonhighlight->getSize().Height;
-
-                core::recti source_area(0, 0, texture_w, texture_h);
-
-                float scale = (float)std::min(irr_driver->getActualScreenSize().Height / 1080.0f, 
-                                            irr_driver->getActualScreenSize().Width / 1350.0f);
-                int size = (int)((90.0f + grow) * scale);
-                const core::recti rect2(glow_center_x - size,
-                                        glow_center_y - size / 2,
-                                        glow_center_x + size,
-                                        glow_center_y + size / 2);
-
-                draw2DImage(tex_ficonhighlight, rect2,
-                    source_area,
-                    /*clipping*/ 0,
-                    /*color*/ 0,
-                    /*alpha*/true);
-            }
-            // if we're not using glow, draw square focus instead
-            else
-            {
-                const bool show_focus = (focused || parent_focused);
-
-                if (!always_show_selection && !show_focus) return;
-
-                // don't mark filler items as focused
-                if (widget->m_properties[PROP_ID] == RibbonWidget::NO_ITEM_ID)
-                    return;
-
-                drawBoxFromStretchableTexture(parentRibbonWidget, rect,
-                    SkinConfig::m_render_params["squareFocusHalo1::neutral"]);
-                nPlayersOnThisItem++;
-            }
-        } // end if mark_focused
-
-        //Handle drawing for everyone else
+            // Don't mark filler items as focused
+            if (widget->m_properties[PROP_ID] == RibbonWidget::NO_ITEM_ID)
+                return;
+            
+            // Hide focus when not forced
+            if (!always_show_selection && !focused && !parent_focused)
+                return;
+                
+            nPlayersOnThisItem = 1;
+        } 
+
+        // Handle drawing for everyone else
         for (unsigned i = 1; i < MAX_PLAYER_COUNT; i++)
         {
             // ---- Draw selection for other players than player 1
@@ -1595,6 +1550,52 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget,
             }
         }
 
+        // Handle drawing for the first player
+        if (mark_focused)
+        {
+            if (use_glow)
+            {
+                static float glow_effect = 0;
+
+                const float dt = GUIEngine::getLatestDt();
+                glow_effect += dt * 3;
+                if (glow_effect > 6.2832f /* 2*PI */) glow_effect -= 6.2832f;
+                float grow = 10.0f * sinf(glow_effect);
+
+                const int glow_center_x = rect.UpperLeftCorner.X
+                    + rect.getWidth() / 2;
+                const int glow_center_y = rect.LowerRightCorner.Y;
+
+                ITexture* tex_ficonhighlight =
+                    SkinConfig::m_render_params["focusHalo::neutral"]
+                    .getImage();
+                const int texture_w = tex_ficonhighlight->getSize().Width;
+                const int texture_h = tex_ficonhighlight->getSize().Height;
+
+                core::recti source_area(0, 0, texture_w, texture_h);
+
+                float scale = (float)std::min(irr_driver->getActualScreenSize().Height / 1080.0f, 
+                                            irr_driver->getActualScreenSize().Width / 1350.0f);
+                int size = (int)((90.0f + grow) * scale);
+                const core::recti rect2(glow_center_x - size,
+                                        glow_center_y - size / 2,
+                                        glow_center_x + size,
+                                        glow_center_y + size / 2);
+
+                draw2DImage(tex_ficonhighlight, rect2,
+                    source_area,
+                    /*clipping*/ 0,
+                    /*color*/ 0,
+                    /*alpha*/true);
+            }
+            // if we're not using glow, draw square focus instead
+            else
+            {
+                drawBoxFromStretchableTexture(parentRibbonWidget, rect,
+                    SkinConfig::m_render_params["squareFocusHalo1::neutral"]);
+            }
+        } // end if mark_focused
+
         drawIconButton(rect, widget, pressed, focused);
 
     } // end if icon ribbons