X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fbutton.cc;h=c70511fc3b98e6c6bb88bbcd56c6407250f42e7c;hb=64ac7d053748494b3a8d0be9f1d55f6f5b9f1a90;hp=04906fe517306f1e06baa4d5a0dbdf28c7934a2c;hpb=d8d9b42777ace234f3471918e1210062578f8188;p=chaz%2Fopenbox

diff --git a/otk/button.cc b/otk/button.cc
index 04906fe5..c70511fc 100644
--- a/otk/button.cc
+++ b/otk/button.cc
@@ -12,6 +12,7 @@ Button::Button(Widget *parent)
   : FocusLabel(parent), _pressed(false), _pressed_focus_tx(0),
     _pressed_unfocus_tx(0), _unpr_focus_tx(0), _unpr_unfocus_tx(0)
 {
+  setStyle(_style);
 }
 
 Button::~Button()
@@ -19,15 +20,14 @@ Button::~Button()
 }
 
 
-void Button::setStyle(Style *style)
+void Button::setStyle(RenderStyle *style)
 {
   FocusLabel::setStyle(style);
 
-  // XXX: do this again
-  //setTexture(style->getButtonFocus());
-  //setUnfocusTexture(style->getButtonUnfocus());
-  //_pressed_focus_tx = style->getButtonPressedFocus();
-  //_pressed_unfocus_tx = style->getButtonPressedUnfocus();
+  setTexture(style->buttonUnpressFocusBackground());
+  setUnfocusTexture(style->buttonUnpressUnfocusBackground());
+  _pressed_focus_tx = style->buttonPressFocusBackground();
+  _pressed_unfocus_tx = style->buttonPressUnfocusBackground();
 }
 
 
@@ -35,10 +35,10 @@ void Button::press(unsigned int mouse_button)
 {
   if (_pressed) return;
 
-  if (_pressed_focus_tx)
-    FocusWidget::setTexture(_pressed_focus_tx);
   if (_pressed_unfocus_tx)
     FocusWidget::setUnfocusTexture(_pressed_unfocus_tx);
+  if (_pressed_focus_tx)
+    FocusWidget::setTexture(_pressed_focus_tx);
   _pressed = true;
   _mouse_button = mouse_button;
 }
@@ -47,8 +47,8 @@ void Button::release(unsigned int mouse_button)
 {
   if (_mouse_button != mouse_button) return; // wrong button
 
-  FocusWidget::setTexture(_unpr_focus_tx);
   FocusWidget::setUnfocusTexture(_unpr_unfocus_tx);
+  FocusWidget::setTexture(_unpr_focus_tx);
   _pressed = false;
 }