Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Window: Fix contents not being drawn if no windowskin is set

This commit is contained in:
Jonas Kulla 2014-07-09 02:47:32 +02:00
parent 56226c40c6
commit 527a372bd3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/window.cpp
View File

@ -577,7 +577,7 @@ struct WindowPrivate
void drawControls() void drawControls()
{ {
if (!windowskin) if (!windowskin && !contents)
return; return;
if (size == Vec2i(0, 0)) if (size == Vec2i(0, 0))
@ -604,6 +604,9 @@ struct WindowPrivate
SimpleAlphaShader &shader = shState->shaders().simpleAlpha; SimpleAlphaShader &shader = shState->shaders().simpleAlpha;
shader.bind(); shader.bind();
shader.applyViewportProj(); shader.applyViewportProj();
if (windowskin)
{
shader.setTranslation(Vec2i(effectX, effectY)); shader.setTranslation(Vec2i(effectX, effectY));
/* Draw arrows / cursors */ /* Draw arrows / cursors */
@ -613,6 +616,7 @@ struct WindowPrivate
controlsQuadArray.draw(0, controlsQuadCount); controlsQuadArray.draw(0, controlsQuadCount);
TEX::setSmooth(false); TEX::setSmooth(false);
}
if (contents) if (contents)
{ {