From: Dana Jansens Date: Fri, 15 Nov 2002 03:10:34 +0000 (+0000) Subject: resizes X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=0856b11de843db30b5053c8cb7d9c84eae262852;p=chaz%2Fopenbox resizes --- diff --git a/otk/button.cc b/otk/button.cc index 1e8a4f03..410f0083 100644 --- a/otk/button.cc +++ b/otk/button.cc @@ -57,7 +57,6 @@ void OtkButton::update(void) OtkFocusWidget::resize(ft.measureString(_text) + bevel * 2, ft.height() + bevel * 2); - OtkFocusWidget::update(); ft.drawString(getWindow(), bevel, bevel, *text_color, _text); @@ -73,4 +72,10 @@ bool OtkButton::expose(const XExposeEvent &e) return OtkFocusWidget::expose(e); } +bool OtkButton::configure(const XConfigureEvent &e) +{ + _dirty = true; + return OtkFocusWidget::configure(e); +} + } diff --git a/otk/button.hh b/otk/button.hh index 48a0f813..f25f731d 100644 --- a/otk/button.hh +++ b/otk/button.hh @@ -35,6 +35,7 @@ public: virtual void update(void); virtual bool expose(const XExposeEvent &e); + virtual bool configure(const XConfigureEvent &e); private: diff --git a/otk/otk_test.cc b/otk/otk_test.cc index f36fcf99..e81b777d 100644 --- a/otk/otk_test.cc +++ b/otk/otk_test.cc @@ -5,6 +5,7 @@ #include "timerqueuemanager.hh" #include "image.hh" #include "style.hh" +#include int main(void) { otk::OBDisplay::initialize(NULL); @@ -59,8 +60,12 @@ int main(void) { 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); + } } } diff --git a/otk/widget.cc b/otk/widget.cc index 3ff484bc..9d8c37a0 100644 --- a/otk/widget.cc +++ b/otk/widget.cc @@ -11,6 +11,7 @@ namespace otk { 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(OtkWidget *parent, Direction direction) 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::ungrabKeyboard(void) 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(); @@ -405,4 +405,24 @@ bool OtkWidget::expose(const XExposeEvent &e) 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; +} + } diff --git a/otk/widget.hh b/otk/widget.hh index ca65730c..60fd2ddb 100644 --- a/otk/widget.hh +++ b/otk/widget.hh @@ -28,6 +28,7 @@ public: 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; } @@ -41,6 +42,9 @@ public: 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 @@ private: Direction _direction; Cursor _cursor; int _bevel_width; + int _ignore_config; bool _visible; bool _focused; @@ -126,7 +131,6 @@ private: bool _fixed_width; bool _fixed_height; -protected: bool _dirty; };