From 141f870ad83a9e334b441735364df0a1fb4d314f Mon Sep 17 00:00:00 2001 From: Alayan Date: Fri, 3 May 2019 00:04:05 +0200 Subject: [PATCH] Fix #3899 --- src/guiengine/skin.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp index 6be185787..a56c1578a 100644 --- a/src/guiengine/skin.cpp +++ b/src/guiengine/skin.cpp @@ -972,7 +972,7 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget, if (mark_selected && (focused || parent_focused)) params = &SkinConfig::m_render_params["tab::focused"]; - else if (parentRibbon->m_mouse_focus == widget && mouseIn) + else if (parent_focused && parentRibbon->m_mouse_focus == widget && mouseIn) params = &SkinConfig::m_render_params["tab::focused"]; else if (mark_selected) params = &SkinConfig::m_render_params["tab::down"]; @@ -1022,7 +1022,7 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget, if (mark_selected && (focused || parent_focused)) params = &SkinConfig::m_render_params["verticalTab::focused"]; - else if (parentRibbon->m_mouse_focus == widget && mouseIn) + else if (parent_focused && parentRibbon->m_mouse_focus == widget && mouseIn) params = &SkinConfig::m_render_params["verticalTab::focused"]; else if (mark_selected) params = &SkinConfig::m_render_params["verticalTab::down"]; @@ -1260,9 +1260,7 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget, } // end if icon ribbons - if (/*mark_selected && widget->hasTooltip() && - (focused || parent_focused) &&*/ - parentRibbon->m_mouse_focus == widget) + if (parent_focused && parentRibbon->m_mouse_focus == widget) { if (rect.isPointInside(irr_driver->getDevice()->getCursorControl() ->getPosition()))