summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/common/imgui/imgui.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-10-15 10:42:29 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-10-15 10:42:29 +0200
commit8981faa61fc1e9421805938e6656d84ff61be1f9 (patch)
tree6295fadfe79ab1f2bafafd3f321e01063ca3cff7 /3rdparty/bgfx/examples/common/imgui/imgui.cpp
parenta74a7a37ef1f6ea1fd9c96148be8fa7ba09b1054 (diff)
update bgfx to latest (nw)
Diffstat (limited to '3rdparty/bgfx/examples/common/imgui/imgui.cpp')
-rw-r--r--3rdparty/bgfx/examples/common/imgui/imgui.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/3rdparty/bgfx/examples/common/imgui/imgui.cpp b/3rdparty/bgfx/examples/common/imgui/imgui.cpp
index 1ff8e090818..073191fde57 100644
--- a/3rdparty/bgfx/examples/common/imgui/imgui.cpp
+++ b/3rdparty/bgfx/examples/common/imgui/imgui.cpp
@@ -466,7 +466,7 @@ struct Imgui
_size = sizeof(s_droidSansTtf);
}
- IMGUI_create(_data, _size, _fontSize, _allocator);
+ IMGUI_create(_data, _size, _fontSize, m_allocator);
m_nvg = nvgCreate(1, m_view);
nvgCreateFontMem(m_nvg, "default", (unsigned char*)_data, INT32_MAX, 0);
@@ -3080,8 +3080,8 @@ struct Imgui
bool visible(int32_t _elemY, int32_t _elemHeight, int32_t _scissorY, int32_t _scissorHeight)
{
- return _elemY > _scissorY
- && (_elemY+_elemHeight) < (_scissorY+_scissorHeight);
+ return (_elemY+_elemHeight) > _scissorY
+ && (_elemY) < (_scissorY+_scissorHeight);
}
inline Area& getCurrentArea()