namespace otk {
OtkWidget::OtkWidget(OtkWidget *parent, Direction direction)
- : _parent(parent), _style(parent->getStyle()), _direction(direction),
+ : OtkEventHandler(),
+ _parent(parent), _style(parent->getStyle()), _direction(direction),
_cursor(parent->getCursor()), _bevel_width(parent->getBevelWidth()),
_ignore_config(0),
_visible(false), _focused(false), _grabbed_mouse(false),
_grabbed_keyboard(false), _stretchable_vert(false),
_stretchable_horz(false), _texture(0), _bg_pixmap(0), _bg_pixel(0),
_screen(parent->getScreen()), _fixed_width(false), _fixed_height(false),
- _dirty(false)
+ _dirty(false), _event_dispatcher(parent->getEventDispatcher())
{
parent->addChild(this);
create();
+ _event_dispatcher->registerHandler(_window, this);
+}
+
+OtkWidget::OtkWidget(OtkApplication *app, Direction direction,
+ Cursor cursor, int bevel_width)
+ : OtkEventHandler(),
+ _parent(0), _style(app->getStyle()), _direction(direction), _cursor(cursor),
+ _bevel_width(bevel_width), _ignore_config(0), _visible(false),
+ _focused(false), _grabbed_mouse(false), _grabbed_keyboard(false),
+ _stretchable_vert(false), _stretchable_horz(false), _texture(0),
+ _bg_pixmap(0), _bg_pixel(0), _screen(app->getStyle()->getScreen()),
+ _fixed_width(false), _fixed_height(false), _dirty(false),
+ _event_dispatcher(app)
+{
+ assert(app);
+ create();
+ _event_dispatcher->registerHandler(_window, this);
}
OtkWidget::OtkWidget(Style *style, Direction direction,
Cursor cursor, int bevel_width)
- : _parent(0), _style(style), _direction(direction), _cursor(cursor),
+ : OtkEventHandler(),
+ _parent(0), _style(style), _direction(direction), _cursor(cursor),
_bevel_width(bevel_width), _ignore_config(0), _visible(false),
_focused(false), _grabbed_mouse(false), _grabbed_keyboard(false),
_stretchable_vert(false), _stretchable_horz(false), _texture(0),
for (it = _children.begin(); it != end; ++it) {
tmp = *it;
- if (tmp->isStretchableHorz() && _fixed_width)
+ if (tmp->isStretchableVert())
+ tmp->setHeight(_rect.height() > _bevel_width * 2 ?
+ _rect.height() - _bevel_width * 2 : _bevel_width);
+ if (tmp->isStretchableHorz())
stretchable.push_back(tmp);
else
width += tmp->_rect.width() + _bevel_width;
int str_width = _rect.width() - width / stretchable.size();
- for (; str_it != str_end; ++str_it) {
- (*str_it)->setWidth(str_width - _bevel_width);
- //(*str_it)->update();
- }
+ for (; str_it != str_end; ++str_it)
+ (*str_it)->setWidth(str_width > _bevel_width ? str_width - _bevel_width
+ : _bevel_width);
}
OtkWidget *prev_widget = 0;
for (it = _children.begin(); it != end; ++it) {
tmp = *it;
- if (tmp->isStretchableVert() && _fixed_height)
+ if (tmp->isStretchableHorz())
+ tmp->setWidth(_rect.width() > _bevel_width * 2 ?
+ _rect.width() - _bevel_width * 2 : _bevel_width);
+ if (tmp->isStretchableVert())
stretchable.push_back(tmp);
else
height += tmp->_rect.height() + _bevel_width;
int str_height = _rect.height() - height / stretchable.size();
- for (; str_it != str_end; ++str_it) {
- (*str_it)->setHeight(str_height - _bevel_width);
- //(*str_it)->update();
- }
+ for (; str_it != str_end; ++str_it)
+ (*str_it)->setHeight(str_height > _bevel_width ?
+ str_height - _bevel_width : _bevel_width);
}
OtkWidget *prev_widget = 0;
void OtkWidget::update(void)
{
- OtkWidgetList::iterator it = _children.begin(), end = _children.end();
- for (; it != end; ++it)
- (*it)->update();
-
if (_dirty) {
adjust();
render();
XClearWindow(OBDisplay::display, _window);
}
+ OtkWidgetList::iterator it = _children.begin(), end = _children.end();
+ for (; it != end; ++it)
+ (*it)->update();
+
_dirty = false;
}
_children.erase(it);
}
-bool OtkWidget::expose(const XExposeEvent &e)
+void OtkWidget::setEventDispatcher(OtkEventDispatcher *disp)
{
+ if (_event_dispatcher)
+ _event_dispatcher->clearHandler(_window);
+ _event_dispatcher = disp;
+ _event_dispatcher->registerHandler(_window, this);
+}
+
+int OtkWidget::exposeHandler(const XExposeEvent &e)
+{
+ OtkEventHandler::exposeHandler(e);
if (e.window == _window) {
_dirty = true;
update();
return true;
- } else {
- OtkWidgetList::iterator it = _children.begin(), end = _children.end();
- for (; it != end; ++it)
- if ((*it)->expose(e))
- return true;
}
return false;
}
-bool OtkWidget::configure(const XConfigureEvent &e)
+int OtkWidget::configureHandler(const XConfigureEvent &e)
{
+ OtkEventHandler::configureHandler(e);
if (e.window == _window) {
if (_ignore_config) {
_ignore_config--;
} else {
- std::cout << "configure\n";
- _dirty = true;
- _rect.setRect(e.x, e.y, e.width, e.height);
+ if (!(e.width == _rect.width() && e.height == _rect.height())) {
+ _dirty = true;
+ _rect.setSize(e.width, e.height);
+ }
update();
}
return true;
- } else {
- OtkWidgetList::iterator it = _children.begin(), end = _children.end();
- for (; it != end; ++it)
- if ((*it)->configure(e))
- return true;
}
+
return false;
}