M otk/button.cc → otk/button.cc

@@ -1,12 +1,10 @@ 
-#include <iostream>
 #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)
+  : OtkFocusLabel(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());
@@ -20,17 +18,22 @@ if (_pressed_focus_tx) delete _pressed_focus_tx;
   if (_pressed_unfocus_tx) delete _pressed_unfocus_tx;
 }
 
-void OtkButton::press(void)
+void OtkButton::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;
 }
 
-void OtkButton::release(void)
+void OtkButton::release(unsigned int mouse_button)
 {
+  if (_mouse_button != mouse_button) return; // wrong button
+
   OtkFocusWidget::setTexture(_unpr_focus_tx);
   OtkFocusWidget::setUnfocusTexture(_unpr_unfocus_tx);
   _pressed = false;
@@ -48,52 +51,18 @@ OtkFocusWidget::setUnfocusTexture(texture);
   _unpr_unfocus_tx = texture;
 }
 
-void OtkButton::update(void)
-{
-  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);
-    OtkFocusWidget::update();
-
-    ft.drawString(getWindow(), bevel, bevel, *text_color, _text);
-  } else
-    OtkFocusWidget::update();
-
-  _dirty = false;
-}
-
 int OtkButton::buttonPressHandler(const XButtonEvent &e)
 {
-  press();
-  _dirty = true;
+  press(e.button);
   update();
   return OtkFocusWidget::buttonPressHandler(e);
 }
 
 int OtkButton::buttonReleaseHandler(const XButtonEvent &e)
 {
-  release();
-  _dirty = true;
+  release(e.button);
   update();
   return OtkFocusWidget::buttonReleaseHandler(e);
-}
-
-int OtkButton::exposeHandler(const XExposeEvent &e)
-{
-  _dirty = true;
-  return OtkFocusWidget::exposeHandler(e);
-}
-
-int OtkButton::configureHandler(const XConfigureEvent &e)
-{
-  if (!(e.width == width() && e.height == height()))
-    _dirty = true;
-  return OtkFocusWidget::configureHandler(e);
 }
 
 }

M otk/button.hh → otk/button.hh

@@ -1,12 +1,11 @@ 
 #ifndef __button_hh
 #define __button_hh
 
-#include "focuswidget.hh"
-//#include "pixmap.hh"
+#include "focuslabel.hh"
 
 namespace otk {
 
-class OtkButton : public OtkFocusWidget {
+class OtkButton : public OtkFocusLabel {
 
 public:
 
@@ -25,29 +24,18 @@ { _pressed_unfocus_tx = texture; }
 
   void setTexture(BTexture *texture);
   void setUnfocusTexture(BTexture *texture);
-
-  inline const std::string &getText(void) const { return _text; }
-  void setText(const std::string &text) { _text = text; _dirty = true; }
-
-  //inline const OtkPixmap &getPixmap(void) const { return _pixmap; }
-  //void setPixmap(const OtkPixmap &pixmap);
 
   inline bool isPressed(void) const { return _pressed; }
-  void press(void);
-  void release(void);
+  void press(unsigned int mouse_button);
+  void release(unsigned int mouse_button);
 
-  void update(void);
-  int exposeHandler(const XExposeEvent &e);
-  int configureHandler(const XConfigureEvent &e);
   int buttonPressHandler(const XButtonEvent &e);
   int buttonReleaseHandler(const XButtonEvent &e);
 
 private:
 
-  std::string _text;
-  //OtkPixmap _pixmap;
   bool _pressed;
-  bool _dirty;
+  unsigned int _mouse_button;
 
   BTexture *_pressed_focus_tx;
   BTexture *_pressed_unfocus_tx;

M otk/otk_test.cc → otk/otk_test.cc

@@ -31,13 +31,14 @@ right.setTexture(app.getStyle()->getTitleFocus());
   right.setUnfocusTexture(app.getStyle()->getTitleUnfocus());
 
   otk::OtkButton iconb(&left);
+  iconb.resize(40,20);
   otk::OtkFocusWidget label(&left);
   otk::OtkButton maxb(&left);
   otk::OtkButton closeb(&left);
   
   // fixed size
   iconb.setText("foo");
-  iconb.press();
+  iconb.press(Button1);
 
   // fix width to 60 and let the height be calculated by its parent
   //label.setHeight(20);