updated wrappers around the new otk widget system and style system

[chaz/openbox] / otk / button.cc

diff --git a/otk/button.cc b/otk/button.cc
index c88fc707c3fa631657ba8e4cd71d792d004ca42f..8d63ed0c3b71a6268b353904d31040a668907ddd 100644 (file)
--- a/otk/button.cc
+++ b/otk/button.cc
@@ -1,31 +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)
-  : OtkWidget(parent), _text(""), _pressed(false),
-    _unfocus_tx(OtkWidget::getStyle()->getButtonUnfocus())
+Button::Button(Widget *parent)
+  : Label(parent), _default(false), _pressed(false)
+{
+  setHorizontalJustify(RenderStyle::CenterJustify);
+  setVerticalJustify(RenderStyle::CenterJustify);
+  styleChanged(*RenderStyle::style(screen()));
+}
+
+Button::~Button()
 {
 }
 
-OtkButton::~OtkButton()
+void Button::press(unsigned int mouse_button)
 {
+  if (_pressed) return;
+
+  _pressed = true;
+  _mouse_button = mouse_button;
 
+  styleChanged(*RenderStyle::style(screen()));
+  refresh();
 }
 
-void OtkButton::setText(const std::string &text)
+void Button::release(unsigned int mouse_button)
 {
-  std::string a = text;
+  if (!_pressed || _mouse_button != mouse_button) return; // wrong button
+
+  _pressed = false;
+
+  styleChanged(*RenderStyle::style(screen()));
+  refresh();
 }
 
-void OtkButton::press(void)
+void Button::buttonPressHandler(const XButtonEvent &e)
 {
+  Widget::buttonPressHandler(e);
+  press(e.button);
+}
 
+void Button::buttonReleaseHandler(const XButtonEvent &e)
+{
+  Widget::buttonReleaseHandler(e);
+  release(e.button);
 }
 
-void OtkButton::release(void)
+void Button::setDefault(bool d)
 {
+  _default = d;
+  styleChanged(*RenderStyle::style(screen()));
+  refresh();
+}
 
+void Button::styleChanged(const RenderStyle &style)
+{
+  if (_default) {
+    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();
+  }
+  Widget::styleChanged(style);
 }
 
 }