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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

18
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,15 +604,19 @@ struct WindowPrivate
SimpleAlphaShader &shader = shState->shaders().simpleAlpha; SimpleAlphaShader &shader = shState->shaders().simpleAlpha;
shader.bind(); shader.bind();
shader.applyViewportProj(); shader.applyViewportProj();
shader.setTranslation(Vec2i(effectX, effectY));
/* Draw arrows / cursors */ if (windowskin)
windowskin->bindTex(shader); {
TEX::setSmooth(true); shader.setTranslation(Vec2i(effectX, effectY));
controlsQuadArray.draw(0, controlsQuadCount); /* Draw arrows / cursors */
windowskin->bindTex(shader);
TEX::setSmooth(true);
TEX::setSmooth(false); controlsQuadArray.draw(0, controlsQuadCount);
TEX::setSmooth(false);
}
if (contents) if (contents)
{ {