Rearrange members

[libs/gltk.git] / source / button.cpp

diff --git a/source/button.cpp b/source/button.cpp
index 8e6e7131cb4157c266b096e4bd121931eb68abdb..e81fe02c20a5ffdc609aa74106adf4b4bc879855 100644 (file)
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007, 2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -30,6 +30,34 @@ void Button::set_icon(const GL::Texture2D *i)
        icon = i;
 }
 
+void Button::render_special(const Part &part) const
+{
+       if(part.get_name()=="text")
+               text.render(part, geom);
+       if(part.get_name()=="icon" && 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();
+       }
+}
+
 void Button::button_press(int, int, unsigned btn)
 {
        if(btn==1)
@@ -62,34 +90,6 @@ void Button::pointer_motion(int x, int y)
        }
 }
 
-void Button::render_special(const Part &part) const
-{
-       if(part.get_name()=="text")
-               text.render(part, geom);
-       if(part.get_name()=="icon" && 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();
-       }
-}
-
 void Button::on_style_change()
 {
        text.set_style(style);