From 5c77bc941f9d992d8994ef7a6b16e347cf2dcbdb Mon Sep 17 00:00:00 2001 From: Dario Manesku Date: Sat, 27 Dec 2014 08:19:54 +0100 Subject: [PATCH] Changed imguiTabs() active color to be consistent with imguiButton(). --- examples/common/imgui/imgui.cpp | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp index 330c79c3..50331c9f 100644 --- a/examples/common/imgui/imgui.cpp +++ b/examples/common/imgui/imgui.cpp @@ -1503,16 +1503,13 @@ struct Imgui const bool over = enabled && inRect(buttonX, yy, tabWidth, _height); const bool res = buttonLogic(id, over); - if (res) - { - selected = ii; - } + const uint32_t textColor = (ii == selected) + ? (enabled ? imguiRGBA(0,0,0,255) : imguiRGBA(255,255,255,100) ) + : (isHot(id) ? imguiRGBA(255,196,0,enabled?255:100) : imguiRGBA(255,255,255,enabled?200:100) ) + ; - uint32_t textColor; if (ii == selected) { - textColor = enabled?imguiRGBA(0,0,0,255):imguiRGBA(255,255,255,100); - drawRoundedRect( (float)buttonX , (float)yy , (float)tabWidth @@ -1521,9 +1518,15 @@ struct Imgui , enabled?imguiRGBA(255,196,0,200):imguiRGBA(128,128,128,32) ); } - else + else if (isActive(id)) { - textColor = isHot(id) ? imguiRGBA(255, 196, 0, enabled?255:100) : imguiRGBA(255, 255, 255, enabled?200:100); + drawRoundedRect( (float)buttonX + , (float)yy + , (float)tabWidth + , (float)_height + , (float)_r + , imguiRGBA(128,128,128,196) + ); } drawText(textX @@ -1532,6 +1535,11 @@ struct Imgui , titles[ii] , textColor ); + + if (res) + { + selected = ii; + } } return selected;