X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fbutton.cc;h=08dc0484a50f6b2192e306fb595227b7b3150981;hb=96a949ec1f2be9da216e4d228992d1ce6855a6d4;hp=98d5780504d8335eaecb40558dca4170c0fecf64;hpb=b169547797768acdb1ca90330375bba5b5caa19e;p=chaz%2Fopenbox

diff --git a/otk/button.cc b/otk/button.cc
index 98d57805..08dc0484 100644
--- a/otk/button.cc
+++ b/otk/button.cc
@@ -1,68 +1,81 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "button.hh"
 
 namespace otk {
 
-OtkButton::OtkButton(OtkWidget *parent)
-  : OtkFocusWidget(parent), _text(""), _pressed(false), _dirty(false),
-    _pressed_focus_tx(0), _pressed_unfocus_tx(0), _unpr_focus_tx(0),
-    _unpr_unfocus_tx(0)
+Button::Button(Widget *parent)
+  : FocusLabel(parent), _pressed(false), _pressed_focus_tx(0),
+    _pressed_unfocus_tx(0), _unpr_focus_tx(0), _unpr_unfocus_tx(0)
 {
-  setTexture(getStyle()->getButtonFocus());
-  setUnfocusTexture(getStyle()->getButtonUnfocus());
-  _pressed_focus_tx = getStyle()->getButtonPressedFocus();
-  _pressed_unfocus_tx = getStyle()->getButtonPressedUnfocus();
+  setStyle(_style);
 }
 
-OtkButton::~OtkButton()
+Button::~Button()
 {
-  if (_pressed_focus_tx) delete _pressed_focus_tx;
-  if (_pressed_unfocus_tx) delete _pressed_unfocus_tx;
 }
 
-void OtkButton::press(void)
+
+void Button::setStyle(RenderStyle *style)
+{
+  FocusLabel::setStyle(style);
+
+  setTexture(style->buttonUnpressFocusBackground());
+  setUnfocusTexture(style->buttonUnpressUnfocusBackground());
+  _pressed_focus_tx = style->buttonPressFocusBackground();
+  _pressed_unfocus_tx = style->buttonPressUnfocusBackground();
+}
+
+
+void Button::press(unsigned int mouse_button)
 {
+  if (_pressed) return;
+
   if (_pressed_focus_tx)
-    OtkFocusWidget::setTexture(_pressed_focus_tx);
+    FocusWidget::setTexture(_pressed_focus_tx);
   if (_pressed_unfocus_tx)
-    OtkFocusWidget::setUnfocusTexture(_pressed_unfocus_tx);
+    FocusWidget::setUnfocusTexture(_pressed_unfocus_tx);
   _pressed = true;
+  _mouse_button = mouse_button;
 }
 
-void OtkButton::release(void)
+void Button::release(unsigned int mouse_button)
 {
-  OtkFocusWidget::setTexture(_unpr_focus_tx);
-  OtkFocusWidget::setUnfocusTexture(_unpr_unfocus_tx);
+  if (_mouse_button != mouse_button) return; // wrong button
+
+  FocusWidget::setTexture(_unpr_focus_tx);
+  FocusWidget::setUnfocusTexture(_unpr_unfocus_tx);
   _pressed = false;
 }
 
-void OtkButton::setTexture(BTexture *texture)
+void Button::setTexture(RenderTexture *texture)
 {
-  OtkFocusWidget::setTexture(texture);
+  FocusWidget::setTexture(texture);
   _unpr_focus_tx = texture;
 }
 
-void OtkButton::setUnfocusTexture(BTexture *texture)
+void Button::setUnfocusTexture(RenderTexture *texture)
 {
-  OtkFocusWidget::setUnfocusTexture(texture);
+  FocusWidget::setUnfocusTexture(texture);
   _unpr_unfocus_tx = texture;
 }
 
-void OtkButton::update(void)
+void Button::buttonPressHandler(const XButtonEvent &e)
 {
-  if (_dirty) {
-    const BFont ft = getStyle()->getFont();
-    BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
-                          : getStyle()->getTextUnfocus());
-    unsigned int bevel = getStyle()->getBevelWidth();
-
-    OtkFocusWidget::resize(ft.measureString(_text) + bevel * 2,
-                           ft.height() + bevel * 2);
-    ft.drawString(getWindow(), bevel, bevel, *text_color, _text);
-
-    OtkFocusWidget::update();
-  }
+  press(e.button);
+  update();
+  FocusWidget::buttonPressHandler(e);
+}
 
-  _dirty = false;
+void Button::buttonReleaseHandler(const XButtonEvent &e)
+{
+  release(e.button);
+  update();
+  FocusWidget::buttonReleaseHandler(e);
 }
 
 }