X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuswidget.cc;h=e3973dc233d81b40b1607114c1513a54187ce322;hb=f55419c19bd4ceee2d6e2994e02e0336bba027b4;hp=ffbaeb7e09bd995b4596eec63b99500bd06f18e4;hpb=a3d036f60ed2333622ee9b61dbddcdc8fbc497c3;p=chaz%2Fopenbox

diff --git a/otk/focuswidget.cc b/otk/focuswidget.cc
index ffbaeb7e..e3973dc2 100644
--- a/otk/focuswidget.cc
+++ b/otk/focuswidget.cc
@@ -1,79 +1,64 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "focuswidget.hh"
 
 namespace otk {
 
-OtkFocusWidget::OtkFocusWidget(OtkWidget *parent, Direction direction)
-  : OtkWidget(parent, direction), _unfocus_texture(0), _focused(true)
+FocusWidget::FocusWidget(Widget *parent, Direction direction)
+  : Widget(parent, direction), _unfocus_texture(0), _unfocus_bcolor(0)
 {
-  _focus_texture = parent->getTexture();
+  _focused = true;
+  _focus_texture = parent->texture();
+  _focus_bcolor = parent->borderColor();
 }
 
-OtkFocusWidget::OtkFocusWidget(OtkApplication *app, Direction direction,
-                               Cursor cursor, int bevel_width)
-  : OtkWidget(app, direction, cursor, bevel_width),
-    _unfocus_texture(0), _focused(true)
+FocusWidget::~FocusWidget()
 {
 }
 
-OtkFocusWidget::OtkFocusWidget(Style *style, Direction direction,
-                               Cursor cursor, int bevel_width)
-  : OtkWidget(style, direction, cursor, bevel_width),
-    _unfocus_texture(0), _focused(true)
-{
-}
-
-OtkFocusWidget::~OtkFocusWidget()
-{
-}
 
-void OtkFocusWidget::focus(void)
+void FocusWidget::focus(void)
 {
   if (_focused)
     return;
 
-  // XXX: what about OtkWidget::focus()
+  Widget::focus();
 
-  assert(_focus_texture);
-  OtkWidget::setTexture(_focus_texture);
-  OtkWidget::update();
+  if (_focus_bcolor)
+    Widget::setBorderColor(_focus_bcolor);
 
-  OtkWidget::OtkWidgetList children = OtkWidget::getChildren();
-
-  OtkWidget::OtkWidgetList::iterator it = children.begin(),
-    end = children.end();
-
-  OtkFocusWidget *tmp = 0;
-  for (; it != end; ++it) {
-    tmp = dynamic_cast<OtkFocusWidget*>(*it);
-    if (tmp) tmp->focus();
-  }
+  Widget::setTexture(_focus_texture);
+  update();
 }
 
-void OtkFocusWidget::unfocus(void)
+void FocusWidget::unfocus(void)
 {
-  if (! _focused)
+  if (!_focused)
     return;
 
-  assert(_unfocus_texture);
-  OtkWidget::setTexture(_unfocus_texture);
-  OtkWidget::update();
-
-  OtkWidget::OtkWidgetList children = OtkWidget::getChildren();
+  Widget::unfocus();
 
-  OtkWidget::OtkWidgetList::iterator it = children.begin(),
-    end = children.end();
+  if (_unfocus_bcolor)
+    Widget::setBorderColor(_unfocus_bcolor);
 
-  OtkFocusWidget *tmp = 0;
-  for (; it != end; ++it) {
-    tmp = dynamic_cast<OtkFocusWidget*>(*it);
-    if (tmp) tmp->unfocus();
-  }
+  Widget::setTexture(_unfocus_texture);
+  update();
 }
 
-void OtkFocusWidget::setTexture(BTexture *texture)
+void FocusWidget::setTexture(RenderTexture *texture)
 {
-  OtkWidget::setTexture(texture);
+  Widget::setTexture(texture);
   _focus_texture = texture;
 }
 
+void FocusWidget::setBorderColor(const RenderColor *color)
+{
+  Widget::setBorderColor(color);
+  _focus_bcolor = color;
+}
+
 }