Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-21 14:23:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added overload for imguiTabs() and fixed va_arg warning.

Browse Source
This commit is contained in:
Dario Manesku
2014-11-20 18:43:27 +01:00
parent 950ceee749
commit b9bd605edc
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/common/imgui/imgui.cpp
View File

@@ -1457,12 +1457,12 @@ struct Imgui
uint8_t ii = 0;
for (; ii < enabledCount; ++ii)
{
bool enabled = va_arg(_argList, int);
const bool enabled = (0 != va_arg(_argList, int) );
tabEnabled[ii] = enabled;
}
for (; ii < _nEnabled; ++ii)
{
bool enabled = va_arg(_argList, int);
const int enabled = va_arg(_argList, int);
BX_UNUSED(enabled);
}
for (; ii < _nTabs; ++ii)
@@ -3258,6 +3258,16 @@ uint8_t imguiTabs(uint8_t _selected, bool _enabled, ImguiAlign::Enum _align, int
return result;
}
uint8_t imguiTabs(uint8_t _selected, bool _enabled, ImguiAlign::Enum _align, int32_t _height, int32_t _r, uint8_t _nTabs, ...)
{
va_list argList;
va_start(argList, _nTabs);
const uint8_t result = s_imgui.tabs(_selected, _enabled, _align, _height, _r, _nTabs, 0, argList);
va_end(argList);
return result;
}
uint32_t imguiChooseUseMacroInstead(uint32_t _selected, ...)
{
va_list argList;

1
examples/common/imgui/imgui.h
View File

@@ -169,6 +169,7 @@ void imguiInput(const char* _label, char* _str, uint32_t _len, bool _enabled = t
/// In the above example, there are 2 enabled flags: 'Tab0' is specified as enabled and 'Tab1' is specified as disabled.
/// Tab2 is unspecified and therefore is treated as enabled.
uint8_t imguiTabs(uint8_t _selected, bool _enabled, ImguiAlign::Enum _align, int32_t _height, int32_t _r, uint8_t _nTabs, uint8_t _nEnabled, ...);
uint8_t imguiTabs(uint8_t _selected, bool _enabled, ImguiAlign::Enum _align, int32_t _height, int32_t _r, uint8_t _nTabs, ...);
uint32_t imguiChooseUseMacroInstead(uint32_t _selected, ...);
#define imguiChoose(...) imguiChooseUseMacroInstead(__VA_ARGS__, NULL)