-#include <msp/gl/immediate.h>
+#include <msp/gl/meshbuilder.h>
#include "button.h"
#include "part.h"
#include "style.h"
geom.h = max(geom.h, icon->get_height()+margin.top+margin.bottom);
}
}
+
+ rebuild();
}
void Button::set_text(const std::string &t)
{
text = t;
signal_autosize_changed.emit();
+ rebuild();
}
void Button::set_icon(const GL::Texture2D *i)
{
icon = i;
+ rebuild();
}
-void Button::render_special(const Part &part) const
+void Button::rebuild_special(const Part &part, CachedPart &cache)
{
if(part.get_name()=="text")
- text.render(part, geom);
- if(part.get_name()=="icon" && icon)
+ text.build(part, geom, cache);
+ if(part.get_name()=="icon")
{
- Geometry rgeom;
- rgeom.w = icon->get_width();
- rgeom.h = icon->get_height();
- part.get_alignment().apply(rgeom, geom, part.get_margin());
-
- icon->bind();
- GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
- imm.color(1.0f, 1.0f, 1.0f);
- imm.begin(GL::QUADS);
- imm.texcoord(0, 0);
- imm.vertex(rgeom.x, rgeom.y);
- imm.texcoord(1, 0);
- imm.vertex(rgeom.x+rgeom.w, rgeom.y);
- imm.texcoord(1, 1);
- imm.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
- imm.texcoord(0, 1);
- imm.vertex(rgeom.x, rgeom.y+rgeom.h);
- imm.end();
- GL::Texture::unbind();
+ cache.texture = icon;
+ if(icon)
+ {
+ Geometry rgeom;
+ rgeom.w = icon->get_width();
+ rgeom.h = icon->get_height();
+ part.get_alignment().apply(rgeom, geom, part.get_margin());
+
+ cache.clear_mesh();
+
+ GL::MeshBuilder bld(*cache.mesh);
+ bld.color(1.0f, 1.0f, 1.0f);
+ bld.begin(GL::QUADS);
+ bld.texcoord(0, 0);
+ bld.vertex(rgeom.x, rgeom.y);
+ bld.texcoord(1, 0);
+ bld.vertex(rgeom.x+rgeom.w, rgeom.y);
+ bld.texcoord(1, 1);
+ bld.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
+ bld.texcoord(0, 1);
+ bld.vertex(rgeom.x, rgeom.y+rgeom.h);
+ bld.end();
+ }
}
}
if(btn==1)
{
pressed = true;
- state |= ACTIVE;
+ set_state(ACTIVE);
}
}
{
if(pressed && btn==1)
{
- state &= ~ACTIVE;
+ clear_state(ACTIVE);
pressed = false;
if(geom.is_inside_relative(x, y))
if(pressed)
{
if(!geom.is_inside_relative(x, y))
- state &= ~ACTIVE;
+ clear_state(ACTIVE);
else
- state |= ACTIVE;
+ set_state(ACTIVE);
}
}