Merge branch 'master' of github.com:bkaradzic/bgfx

This commit is contained in:
Branimir Karadžić 2015-02-23 17:25:13 -08:00
commit 9e877bfb00

View file

@ -2023,7 +2023,7 @@ struct Imgui
xx = -borderSize; xx = -borderSize;
yy = -1; yy = -1;
width = 2*borderSize+1; width = 2*borderSize+1;
height = m_viewHeight; height = m_viewHeight+1;
triX = 0; triX = 0;
triY = (m_viewHeight-triSize)/2; triY = (m_viewHeight-triSize)/2;
orientation = _checked ? TriangleOrientation::Left : TriangleOrientation::Right; orientation = _checked ? TriangleOrientation::Left : TriangleOrientation::Right;
@ -2033,7 +2033,7 @@ struct Imgui
xx = m_viewWidth - borderSize; xx = m_viewWidth - borderSize;
yy = -1; yy = -1;
width = 2*borderSize+1; width = 2*borderSize+1;
height = m_viewHeight; height = m_viewHeight+1;
triX = m_viewWidth - triSize - 2; triX = m_viewWidth - triSize - 2;
triY = (m_viewHeight-width)/2; triY = (m_viewHeight-width)/2;
orientation = _checked ? TriangleOrientation::Right : TriangleOrientation::Left; orientation = _checked ? TriangleOrientation::Right : TriangleOrientation::Left;