scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 18:45:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added optional parameter for imguiButton().

Browse source
This commit is contained in:
Dario Manesku 2014-08-11 21:28:39 +01:00
parent c2b0ee89cb
commit 762c423b42
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -845,7 +845,7 @@ struct Imgui
m_insideCurrentScroll = false; m_insideCurrentScroll = false;
} }
bool button(const char* _text, bool _enabled) bool button(const char* _text, bool _enabled, int32_t _r)
{ {
m_widgetId++; m_widgetId++;
uint16_t id = (m_areaId << 8) | m_widgetId; uint16_t id = (m_areaId << 8) | m_widgetId;
@ -860,13 +860,25 @@ struct Imgui
bool over = enabled && inRect(xx, yy, width, height); bool over = enabled && inRect(xx, yy, width, height);
bool res = buttonLogic(id, over); bool res = buttonLogic(id, over);
drawRoundedRect( (float)xx if (0 == _r)
, (float)yy {
, (float)width drawRect( (float)xx
, (float)height , (float)yy
, (float)BUTTON_HEIGHT / 2 - 1 , (float)width
, imguiRGBA(128, 128, 128, isActive(id) ? 196 : 96) , (float)height
); , imguiRGBA(128, 128, 128, isActive(id) ? 196 : 96)
);
}
else
{
drawRoundedRect( (float)xx
, (float)yy
, (float)width
, (float)height
, (float)_r
, imguiRGBA(128, 128, 128, isActive(id) ? 196 : 96)
);
}
if (enabled) if (enabled)
{ {
@ -2498,9 +2510,9 @@ void imguiSeparatorLine(uint16_t _height)
s_imgui.separatorLine(_height); s_imgui.separatorLine(_height);
} }
bool imguiButton(const char* _text, bool _enabled) bool imguiButton(const char* _text, bool _enabled, int32_t _r)
{ {
return s_imgui.button(_text, _enabled); return s_imgui.button(_text, _enabled, _r);
} }
bool imguiItem(const char* _text, bool _enabled) bool imguiItem(const char* _text, bool _enabled)

2
examples/common/imgui/imgui.h
View file

@ -98,7 +98,7 @@ void imguiUnindent(uint16_t _width = 16);
void imguiSeparator(uint16_t _height = 12); void imguiSeparator(uint16_t _height = 12);
void imguiSeparatorLine(uint16_t _height = 12); void imguiSeparatorLine(uint16_t _height = 12);
bool imguiButton(const char* _text, bool _enabled = true); bool imguiButton(const char* _text, bool _enabled = true, int32_t _r = 9);
bool imguiItem(const char* _text, bool _enabled = true); bool imguiItem(const char* _text, bool _enabled = true);
bool imguiCheck(const char* _text, bool _checked, bool _enabled = true); bool imguiCheck(const char* _text, bool _checked, bool _enabled = true);
bool imguiCollapse(const char* _text, const char* _subtext, bool _checked, bool _enabled = true); bool imguiCollapse(const char* _text, const char* _subtext, bool _checked, bool _enabled = true);