Rearrange members

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

diff --git a/source/button.cpp b/source/button.cpp
index 292625de9f9e4bba00e6598f1ff1eed0d645c207..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
 */
 
@@ -12,56 +12,22 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-Button::Button(const Resources &r, const std::string &t):
-       Widget(r),
-       text(style),
+Button::Button(const std::string &t):
+       text(),
        icon(0),
        pressed(false)
 {
-       update_style();
        set_text(t);
 }
 
 void Button::set_text(const std::string &t)
 {
-       text=t;
+       text = t;
 }
 
 void Button::set_icon(const GL::Texture2D *i)
 {
-       icon=i;
-}
-
-void Button::button_press(int, int, unsigned btn)
-{
-       if(btn==1)
-       {
-               pressed=true;
-               state|=ACTIVE;
-       }
-}
-
-void Button::button_release(int x, int y, unsigned btn)
-{
-       if(pressed && btn==1)
-       {
-               state&=~ACTIVE;
-               pressed=false;
-
-               if(geom.is_inside_relative(x, y))
-                       signal_clicked.emit();
-       }
-}
-
-void Button::pointer_motion(int x, int y)
-{
-       if(pressed)
-       {
-               if(!geom.is_inside_relative(x, y))
-                       state&=~ACTIVE;
-               else
-                       state|=ACTIVE;
-       }
+       icon = i;
 }
 
 void Button::render_special(const Part &part) const
@@ -71,8 +37,8 @@ void Button::render_special(const Part &part) const
        if(part.get_name()=="icon" && icon)
        {
                Geometry rgeom;
-               rgeom.w=icon->get_width();
-               rgeom.h=icon->get_height();
+               rgeom.w = icon->get_width();
+               rgeom.h = icon->get_height();
                part.get_alignment().apply(rgeom, geom, part.get_margin());
 
                icon->bind();
@@ -92,9 +58,41 @@ void Button::render_special(const Part &part) const
        }
 }
 
+void Button::button_press(int, int, unsigned btn)
+{
+       if(btn==1)
+       {
+               pressed = true;
+               state |= ACTIVE;
+       }
+}
+
+void Button::button_release(int x, int y, unsigned btn)
+{
+       if(pressed && btn==1)
+       {
+               state &= ~ACTIVE;
+               pressed = false;
+
+               if(geom.is_inside_relative(x, y))
+                       signal_clicked.emit();
+       }
+}
+
+void Button::pointer_motion(int x, int y)
+{
+       if(pressed)
+       {
+               if(!geom.is_inside_relative(x, y))
+                       state &= ~ACTIVE;
+               else
+                       state |= ACTIVE;
+       }
+}
+
 void Button::on_style_change()
 {
-       text.update_style();
+       text.set_style(style);
 }
 
 
@@ -106,7 +104,7 @@ Button::Loader::Loader(Button &btn):
 
 void Button::Loader::text(const std::string &t)
 {
-       static_cast<Button &>(wdg).text=t;
+       static_cast<Button &>(wdg).text = t;
 }
 
 } // namespace GLtk