X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fbutton.cc;h=f068d5a5edd03a38cde7a3432df9a7cb24c73b03;hb=213df2814b002da2c5f324210d44559f9d651e21;hp=fd23a5698d74d54ff15851df3c25255834459025;hpb=948feddc2e0d3c846e1c4669681c475e99540a8b;p=chaz%2Fopenbox

diff --git a/otk/button.cc b/otk/button.cc
index fd23a569..f068d5a5 100644
--- a/otk/button.cc
+++ b/otk/button.cc
@@ -1,81 +1,75 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
 
 #include "button.hh"
 
 namespace otk {
 
-OtkButton::OtkButton(OtkWidget *parent)
-  : OtkFocusLabel(parent), _pressed(false), _pressed_focus_tx(0),
-    _pressed_unfocus_tx(0), _unpr_focus_tx(0), _unpr_unfocus_tx(0)
+Button::Button(Widget *parent)
+  : Label(parent),
+    _pressed(false)
 {
-  setStyle(getStyle());
+  setHorizontalJustify(RenderStyle::CenterJustify);
+  setVerticalJustify(RenderStyle::CenterJustify);
+  styleChanged(*RenderStyle::style(screen()));
 }
 
-OtkButton::~OtkButton()
+Button::~Button()
 {
 }
 
-
-void OtkButton::setStyle(Style *style)
-{
-  OtkFocusLabel::setStyle(style);
-  
-  setTexture(getStyle()->getButtonFocus());
-  setUnfocusTexture(getStyle()->getButtonUnfocus());
-  _pressed_focus_tx = getStyle()->getButtonPressedFocus();
-  _pressed_unfocus_tx = getStyle()->getButtonPressedUnfocus();
-}
-
-
-void OtkButton::press(unsigned int mouse_button)
+void Button::press(unsigned int mouse_button)
 {
   if (_pressed) return;
 
-  if (_pressed_focus_tx)
-    OtkFocusWidget::setTexture(_pressed_focus_tx);
-  if (_pressed_unfocus_tx)
-    OtkFocusWidget::setUnfocusTexture(_pressed_unfocus_tx);
   _pressed = true;
   _mouse_button = mouse_button;
+
+  styleChanged(*RenderStyle::style(screen()));
+  refresh();
 }
 
-void OtkButton::release(unsigned int mouse_button)
+void Button::release(unsigned int mouse_button)
 {
-  if (_mouse_button != mouse_button) return; // wrong button
+  if (!_pressed || _mouse_button != mouse_button) return; // wrong button
 
-  OtkFocusWidget::setTexture(_unpr_focus_tx);
-  OtkFocusWidget::setUnfocusTexture(_unpr_unfocus_tx);
   _pressed = false;
-}
 
-void OtkButton::setTexture(BTexture *texture)
-{
-  OtkFocusWidget::setTexture(texture);
-  _unpr_focus_tx = texture;
-}
+  styleChanged(*RenderStyle::style(screen()));
+  refresh();
 
-void OtkButton::setUnfocusTexture(BTexture *texture)
-{
-  OtkFocusWidget::setUnfocusTexture(texture);
-  _unpr_unfocus_tx = texture;
+  clickHandler(_mouse_button);
 }
 
-void OtkButton::buttonPressHandler(const XButtonEvent &e)
+void Button::buttonPressHandler(const XButtonEvent &e)
 {
+  Widget::buttonPressHandler(e);
   press(e.button);
-  update();
-  OtkFocusWidget::buttonPressHandler(e);
 }
 
-void OtkButton::buttonReleaseHandler(const XButtonEvent &e)
+void Button::buttonReleaseHandler(const XButtonEvent &e)
 {
+  Widget::buttonReleaseHandler(e);
   release(e.button);
-  update();
-  OtkFocusWidget::buttonReleaseHandler(e);
+}
+
+void Button::styleChanged(const RenderStyle &style)
+{
+  if (isHighlighted()) {
+    if (_pressed)
+      _texture = style.buttonPressFocusBackground();
+    else
+      _texture = style.buttonUnpressFocusBackground();
+    _forecolor = style.buttonFocusColor();
+  } else {
+    if (_pressed)
+      _texture = style.buttonPressUnfocusBackground();
+    else
+      _texture = style.buttonUnpressUnfocusBackground();
+    _forecolor = style.buttonUnfocusColor();
+  }
+  refresh();
 }
 
 }