resizes
Dana Jansens danakj@orodu.net
5 files changed,
42 insertions(+),
7 deletions(-)
M
otk/otk_test.cc
→
otk/otk_test.cc
@@ -5,6 +5,7 @@ #include "configuration.hh"
#include "timerqueuemanager.hh" #include "image.hh" #include "style.hh" +#include <iostream> int main(void) { otk::OBDisplay::initialize(NULL);@@ -59,8 +60,12 @@ while (1) {
if (XPending(otk::OBDisplay::display)) { XEvent e; XNextEvent(otk::OBDisplay::display, &e); - if (e.type == Expose) + if (e.type == Expose) { foo.expose(e.xexpose); + } else if (e.type == ConfigureNotify) { + std::cout << "configure\n"; + foo.configure(e.xconfigure); + } } }
M
otk/widget.cc
→
otk/widget.cc
@@ -11,6 +11,7 @@
OtkWidget::OtkWidget(OtkWidget *parent, Direction direction) : _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),@@ -24,7 +25,7 @@
OtkWidget::OtkWidget(Style *style, Direction direction, Cursor cursor, int bevel_width) : _parent(0), _style(style), _direction(direction), _cursor(cursor), - _bevel_width(bevel_width), _visible(false), + _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(style->getScreen()),@@ -124,6 +125,7 @@ void OtkWidget::setGeometry(int x, int y, int width, int height)
{ _rect = Rect(x, y, width, height); _dirty = true; + _ignore_config++; XMoveResizeWindow(otk::OBDisplay::display, _window, x, y, width, height); }@@ -208,11 +210,9 @@ }
void OtkWidget::render(void) { - Pixmap old = _bg_pixmap; - _bg_pixmap = _texture->render(_rect.width(), _rect.height(), _bg_pixmap); - if (_bg_pixmap && _bg_pixmap != old) + if (_bg_pixmap) XSetWindowBackgroundPixmap(otk::OBDisplay::display, _window, _bg_pixmap); else { unsigned int pix = _texture->color().pixel();@@ -400,6 +400,26 @@ } 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) +{ + if (e.window == _window) { + if (_ignore_config) { + _ignore_config--; + } else { + _dirty = true; + _rect.setRect(e.x, e.y, 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;
M
otk/widget.hh
→
otk/widget.hh
@@ -28,6 +28,7 @@
virtual void update(void); virtual bool expose(const XExposeEvent &e); + virtual bool configure(const XConfigureEvent &e); inline Window getWindow(void) const { return _window; } inline const OtkWidget *getParent(void) const { return _parent; }@@ -40,6 +41,9 @@ void move(int x, int y);
virtual void setWidth(int); virtual void setHeight(int); + + virtual int width() const { return _rect.width(); } + virtual int height() const { return _rect.height(); } virtual void resize(const Point &to); virtual void resize(int x, int y);@@ -106,6 +110,7 @@ Style *_style;
Direction _direction; Cursor _cursor; int _bevel_width; + int _ignore_config; bool _visible; bool _focused;@@ -126,7 +131,6 @@
bool _fixed_width; bool _fixed_height; -protected: bool _dirty; };