Window: Fix contents not being drawn if no windowskin is set
This commit is contained in:
parent
56226c40c6
commit
527a372bd3
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue