#include "display.hh"
#include "assassin.hh"
#include "screeninfo.hh"
-
+#include "focuslabel.hh"
#include <algorithm>
#include <iostream>
parent->addChild(this);
create();
_event_dispatcher->registerHandler(_window, this);
- setStyle(_style); // let the widget initialize stuff
}
Widget::Widget(EventDispatcher *event_dispatcher, RenderStyle *style,
assert(style);
create(override_redirect);
_event_dispatcher->registerHandler(_window, this);
- setStyle(_style); // let the widget initialize stuff
}
Widget::~Widget()
_rect = Rect(x, y, width, height);
_dirty = true;
+ // make all parents dirty too
+ Widget *p = _parent;
+ while (p) {
+ p->_dirty = true;
+ p = p->_parent;
+ }
+
// don't use an XMoveResizeWindow here, because it doesn't seem to move
// windows with StaticGravity? This works, that didn't.
XResizeWindow(**display, _window, width, height);
if (recursive) {
WidgetList::iterator it = _children.begin(), end = _children.end();
for (; it != end; ++it)
- (*it)->show();
+ (*it)->show(recursive);
}
XMapWindow(**display, _window);
void Widget::render(void)
{
if (!_texture) return;
- printf("RENDER\n");
Surface *s = _surface; // save the current surface
_surface = new Surface(_screen, _rect.size());
display->renderControl(_screen)->drawBackground(*_surface, *_texture);
- renderForeground();
+ renderForeground(); // for inherited types to render onto the _surface
XSetWindowBackgroundPixmap(**display, _window, _surface->pixmap());
if (prev_widget)
x = prev_widget->_rect.x() + prev_widget->_rect.width() + _bevel_width;
else
- x = _rect.x() + _bevel_width;
+ x = _bevel_width;
y = (tallest - tmp->_rect.height()) / 2 + _bevel_width;
tmp->move(x, y);
prev_widget = tmp;
}
-
internalResize(width, tallest + _bevel_width * 2);
}
if (prev_widget)
y = prev_widget->_rect.y() + prev_widget->_rect.height() + _bevel_width;
else
- y = _rect.y() + _bevel_width;
+ y = _bevel_width;
x = (widest - tmp->_rect.width()) / 2 + _bevel_width;
tmp->move(x, y);
internalResize(widest + _bevel_width * 2, height);
}
-void Widget::update(void)
+void Widget::update()
{
if (_dirty) {
adjust();
{
assert(w > 0 && h > 0);
- if (! _fixed_width && ! _fixed_height)
+ bool fw = _fixed_width, fh = _fixed_height;
+
+ if (! fw && ! fh)
resize(w, h);
- else if (! _fixed_width)
+ else if (! fw)
resize(w, _rect.height());
- else if (! _fixed_height)
+ else if (! fh)
resize(_rect.width(), h);
+
+ _fixed_width = fw;
+ _fixed_height = fh;
}
void Widget::addChild(Widget *child, bool front)