X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fbutton.cc;h=313d8acfcf52751e0b56162444763cba6a84ec4b;hb=8269fc2b3965d12ba308caa554bfa7ee037fba13;hp=1b2ef7cec45efee10b191d5353a1f6da47ac45dc;hpb=12a95bfdb31595ec53d72adef4e0fd6bf1ccf218;p=chaz%2Fopenbox

diff --git a/otk/button.cc b/otk/button.cc
index 1b2ef7ce..313d8acf 100644
--- a/otk/button.cc
+++ b/otk/button.cc
@@ -1,68 +1,77 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#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)
 {
-  setTexture(getStyle()->getButtonFocus());
-  setUnfocusTexture(getStyle()->getButtonUnfocus());
-  _pressed_focus_tx = getStyle()->getButtonPressedFocus();
-  _pressed_unfocus_tx = getStyle()->getButtonPressedUnfocus();
+  setHorizontalJustify(RenderStyle::CenterJustify);
+  setVerticalJustify(RenderStyle::CenterJustify);
+  styleChanged(*RenderStyle::style(screen()));
 }
 
-OtkButton::~OtkButton()
+Button::~Button()
 {
-  if (_pressed_focus_tx) delete _pressed_focus_tx;
-  if (_pressed_unfocus_tx) delete _pressed_unfocus_tx;
 }
 
-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)
+void Button::buttonPressHandler(const XButtonEvent &e)
 {
-  OtkFocusWidget::setUnfocusTexture(texture);
-  _unpr_unfocus_tx = texture;
+  Widget::buttonPressHandler(e);
+  press(e.button);
 }
 
-void OtkButton::buttonPressHandler(const XButtonEvent &e)
+void Button::buttonReleaseHandler(const XButtonEvent &e)
 {
-  press(e.button);
-  update();
-  OtkFocusWidget::buttonPressHandler(e);
+  Widget::buttonReleaseHandler(e);
+  bool p = _pressed;
+  release(e.button);
+  if (p && !_pressed && e.x > 0 && e.y > 0 &&
+      e.x < area().width() && e.y < area().height())
+    clickHandler(_mouse_button);
 }
 
-void OtkButton::buttonReleaseHandler(const XButtonEvent &e)
+void Button::styleChanged(const RenderStyle &style)
 {
-  release(e.button);
-  update();
-  OtkFocusWidget::buttonReleaseHandler(e);
+  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();
 }
 
 }