scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-29 02:55:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #222 from dariomanesku/master

Browse source 
Small imgui update.
This commit is contained in:
Branimir Karadžić 2014-12-28 23:52:56 -08:00
commit 37f5903f12
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
examples/common/imgui/imgui.cpp
View file

@ -1503,16 +1503,13 @@ struct Imgui
const bool over = enabled && inRect(buttonX, yy, tabWidth, _height); const bool over = enabled && inRect(buttonX, yy, tabWidth, _height);
const bool res = buttonLogic(id, over); const bool res = buttonLogic(id, over);
if (res) const uint32_t textColor = (ii == selected)
{ ? (enabled ? imguiRGBA(0,0,0,255) : imguiRGBA(255,255,255,100) )
selected = ii; : (isHot(id) ? imguiRGBA(255,196,0,enabled?255:100) : imguiRGBA(255,255,255,enabled?200:100) )
} ;
uint32_t textColor;
if (ii == selected) if (ii == selected)
{ {
textColor = enabled?imguiRGBA(0,0,0,255):imguiRGBA(255,255,255,100);
drawRoundedRect( (float)buttonX drawRoundedRect( (float)buttonX
, (float)yy , (float)yy
, (float)tabWidth , (float)tabWidth
@ -1521,9 +1518,15 @@ struct Imgui
, enabled?imguiRGBA(255,196,0,200):imguiRGBA(128,128,128,32) , 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 drawText(textX
@ -1532,6 +1535,11 @@ struct Imgui
, titles[ii] , titles[ii]
, textColor , textColor
); );
if (res)
{
selected = ii;
}
} }
return selected; return selected;
@ -1884,8 +1892,8 @@ struct Imgui
if (ImguiBorder::Left == _border) if (ImguiBorder::Left == _border)
{ {
xx = -borderSize; xx = -borderSize;
yy = 0; yy = -1;
width = 2*borderSize; width = 2*borderSize+1;
height = m_viewHeight; height = m_viewHeight;
triX = 0; triX = 0;
triY = (m_viewHeight-triSize)/2; triY = (m_viewHeight-triSize)/2;
@ -1894,8 +1902,8 @@ struct Imgui
else if (ImguiBorder::Right == _border) else if (ImguiBorder::Right == _border)
{ {
xx = m_viewWidth - borderSize; xx = m_viewWidth - borderSize;
yy = 0; yy = -1;
width = 2*borderSize; width = 2*borderSize+1;
height = m_viewHeight; height = m_viewHeight;
triX = m_viewWidth - triSize - 2; triX = m_viewWidth - triSize - 2;
triY = (m_viewHeight-width)/2; triY = (m_viewHeight-width)/2;