X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=1a0c7d9ea40828b9a81daddb5e54f6b0d2bd38e8;hb=b6ad10764e75923ecb55d3dce96415eb991c64ec;hp=75c3a2abbdbe7137e1688566f6d1cac819876845;hpb=5673ab7e708fa0368ec8e1056a2f61ca8ba49848;p=chaz%2Fopenbox

diff --git a/otk/widget.cc b/otk/widget.cc
index 75c3a2ab..1a0c7d9e 100644
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -63,6 +63,7 @@ Widget::Widget(Widget *parent, Direction direction, int bevel)
   parent->addChild(this);
   if (parent->visible()) parent->layout();
   _dispatcher->registerHandler(_window, this);
+  styleChanged(*RenderStyle::style(_screen));
 }
 
 Widget::~Widget()
@@ -85,6 +86,8 @@ void Widget::show(bool children)
     }
   }
   if (!_visible) {
+    if (_parent) _parent->calcDefaultSizes();
+    else resize(_area.size()); // constrain sizes
     _visible = true;
     XMapWindow(**display, _window);
     update();
@@ -96,7 +99,10 @@ void Widget::hide()
   if (_visible) {
     _visible = false;
     XUnmapWindow(**display, _window);
-    if (_parent) _parent->layout();
+    if (_parent) {
+      _parent->calcDefaultSizes();
+      _parent->layout();
+    }
   }
 } 
 
@@ -110,9 +116,10 @@ void Widget::update()
 {
   if (!_visible) return;
   _dirty = true;
-  if (parent())
-    parent()->layout(); // relay-out us and our siblings
-  else {
+  if (_parent) {
+    _parent->calcDefaultSizes();
+    _parent->layout(); // relay-out us and our siblings
+  } else {
     render();
     layout();
   }
@@ -121,17 +128,18 @@ void Widget::update()
 void Widget::moveresize(const Rect &r)
 {
   int w, h;
-  w = std::min(std::max(r.width(), minSize().width()), maxSize().width());
-  h = std::min(std::max(r.height(), minSize().height()), maxSize().height());
+  w = std::max(std::min(r.width(), maxSize().width()), minSize().width());
+  h = std::max(std::min(r.height(), maxSize().height()), minSize().height());
+
+  bool sizechange = !(w == area().width() && h == area().height());
 
-  if (r.x() == area().x() && r.y() == area().y() &&
-      w == area().width() && h == area().height()) {
+  if (r.x() == area().x() && r.y() == area().y() && !sizechange)
     return; // no change, don't cause a big layout chain to occur!
-  }
   
   internal_moveresize(r.x(), r.y(), w, h);
 
-  update();
+  if (sizechange)
+    update();
 }
 
 void Widget::internal_moveresize(int x, int y, int w, int h)
@@ -140,9 +148,15 @@ void Widget::internal_moveresize(int x, int y, int w, int h)
   assert(h > 0);
   assert(_borderwidth >= 0);
   _dirty = true;
-  XMoveResizeWindow(**display, _window, x, y,
-                    w - _borderwidth * 2,
-                    h - _borderwidth * 2);
+  if (!(x == _area.x() && y == _area.y())) {
+    if (!(w == _area.width() && h == _area.height()))
+      XMoveResizeWindow(**display, _window, x, y,
+                        w - _borderwidth * 2,
+                        h - _borderwidth * 2);
+    else
+      XMoveWindow(**display, _window, x, y);
+  } else
+    XResizeWindow(**display, _window, w - _borderwidth*2, h - _borderwidth*2);
   _ignore_config++;
 
   _area = Rect(x, y, w, h);
@@ -185,6 +199,50 @@ void Widget::createWindow(bool overrideredir)
   ++_ignore_config;
 }
 
+void Widget::calcDefaultSizes()
+{
+  std::list<Widget*>::const_iterator it, end = _children.end();
+  int min_biggest = 0, max_biggest = 0;
+  int min_sum = _bevel + _borderwidth * 2;
+  int max_sum = _bevel + _borderwidth * 2;
+  bool fullmax = false;
+
+  for (it = _children.begin(); it != end; ++it) {
+    const otk::Size &min = (*it)->minSize();
+    const otk::Size &max = (*it)->maxSize();
+    if (_direction == Horizontal) {
+      if (min.height() > min_biggest) min_biggest = min.height();
+      if (max.height() > max_biggest) max_biggest = max.height();
+      min_sum += _bevel + min.width();
+      if (max.width() == INT_MAX)
+        fullmax = true;
+      else if (!fullmax)
+        max_sum += _bevel + max.width();
+    } else {
+      if (min.width() > min_biggest) min_biggest = min.width();
+      if (max.width() > max_biggest) max_biggest = max.width();
+      min_sum += _bevel + min.height();
+      if (max.height() == INT_MAX)
+        fullmax = true;
+      else if (!fullmax)
+        max_sum += _bevel + max.height();
+    }
+  }
+  if (_direction == Horizontal) {
+    _min_size = otk::Size(min_sum + (_bevel + _borderwidth) * 2,
+                          min_biggest + (_bevel + _borderwidth) * 2);
+    _max_size = otk::Size((fullmax ? INT_MAX :
+                           max_sum  + (_bevel + _borderwidth) * 2),
+                          max_biggest);
+  } else {
+    _min_size = otk::Size(min_biggest + (_bevel + _borderwidth) * 2,
+                          min_sum + (_bevel + _borderwidth) * 2);
+    _max_size = otk::Size(max_biggest, (fullmax ? INT_MAX : max_sum +
+                                        (_bevel + _borderwidth) * 2));
+  }
+  update();
+}
+
 void Widget::setBorderWidth(int w)
 {
   assert(w >= 0);
@@ -238,13 +296,10 @@ void Widget::layoutHorz()
   std::list<Widget*>::iterator it, end;
 
   // work with just the visible children
-  std::list<Widget*> visible = _children;
-  for (it = visible.begin(), end = visible.end(); it != end;) {
-    std::list<Widget*>::iterator next = it; ++next;
-    if (!(*it)->visible())
-      visible.erase(it);
-    it = next;
-  }
+  std::list<Widget*> visible;
+  for (it = _children.begin(), end = _children.end(); it != end; ++it)
+    if ((*it)->visible())
+      visible.push_back(*it);
 
   if (visible.empty()) return;
 
@@ -258,16 +313,14 @@ void Widget::layoutHorz()
   if (free < 0) free = 0;
   int each;
   
-  std::list<Widget*> adjustable = visible;
+  std::list<Widget*> adjustable;
 
   // find the 'free' space, and how many children will be using it
-  for (it = adjustable.begin(), end = adjustable.end(); it != end;) {
-    std::list<Widget*>::iterator next = it; ++next;
+  for (it = visible.begin(), end = visible.end(); it != end; ++it) {
     free -= (*it)->minSize().width();
     if (free < 0) free = 0;
-    if ((*it)->maxSize().width() - (*it)->minSize().width() <= 0)
-      adjustable.erase(it);
-    it = next;
+    if ((*it)->maxSize().width() - (*it)->minSize().width() > 0)
+      adjustable.push_back(*it);
   }
   // some widgets may have max widths that restrict them, find the 'true'
   // amount of free space after these widgets are not included
@@ -334,13 +387,10 @@ void Widget::layoutVert()
   std::list<Widget*>::iterator it, end;
 
   // work with just the visible children
-  std::list<Widget*> visible = _children;
-  for (it = visible.begin(), end = visible.end(); it != end;) {
-    std::list<Widget*>::iterator next = it; ++next;
-    if (!(*it)->visible())
-      visible.erase(it);
-    it = next;
-  }
+  std::list<Widget*> visible;
+  for (it = _children.begin(), end = _children.end(); it != end; ++it)
+    if ((*it)->visible())
+      visible.push_back(*it);
 
   if (visible.empty()) return;
 
@@ -354,16 +404,14 @@ void Widget::layoutVert()
   if (free < 0) free = 0;
   int each;
 
-  std::list<Widget*> adjustable = visible;
+  std::list<Widget*> adjustable;
 
   // find the 'free' space, and how many children will be using it
-  for (it = adjustable.begin(), end = adjustable.end(); it != end;) {
-    std::list<Widget*>::iterator next = it; ++next;
+  for (it = visible.begin(), end = visible.end(); it != end; ++it) {
     free -= (*it)->minSize().height();
     if (free < 0) free = 0;
-    if ((*it)->maxSize().height() - (*it)->minSize().height() <= 0)
-      adjustable.erase(it);
-    it = next;
+    if ((*it)->maxSize().height() - (*it)->minSize().height() > 0)
+      adjustable.push_back(*it);
   }
   // some widgets may have max heights that restrict them, find the 'true'
   // amount of free space after these widgets are not included
@@ -387,7 +435,7 @@ void Widget::layoutVert()
 
   // place/size the widgets
   if (!adjustable.empty())
-  each = free / adjustable.size();
+    each = free / adjustable.size();
   else
     each = 0;
   for (it = visible.begin(), end = visible.end(); it != end; ++it) {
@@ -429,7 +477,10 @@ void Widget::render()
 {
   if (!_dirty) return;
   if (!_texture) {
-    XSetWindowBackgroundPixmap(**display, _window, ParentRelative);
+    // set a solid color as the default background
+    XSetWindowBackground(**display, _window,
+                         RenderStyle::style(_screen)->
+                         titlebarUnfocusBackground()->color().pixel());
     return;
   }
   if (_borderwidth * 2 > _area.width() ||
@@ -448,6 +499,7 @@ void Widget::render()
   // delete the old surface *after* its pixmap isn't in use anymore
   if (_surface) delete _surface;
 
+  s->freePixelData(); // done rendering with this surface
   _surface = s;
 
   _dirty = false;
@@ -460,6 +512,11 @@ void Widget::renderChildren()
     (*it)->render();
 }
 
+void Widget::styleChanged(const RenderStyle &)
+{
+  refresh();
+}
+
 void Widget::exposeHandler(const XExposeEvent &e)
 {
   EventHandler::exposeHandler(e);
@@ -473,7 +530,7 @@ void Widget::configureHandler(const XConfigureEvent &e)
   } else {
     // only interested in these for top level windows
     if (_parent) return;
-    
+
     XEvent ev;
     ev.xconfigure.width = e.width;
     ev.xconfigure.height = e.height;