1 files changed, 49 insertions, 13 deletions

diff --git a/dw/ui.hh b/dw/ui.hh
index e92c48d1..c64880b4 100644
--- a/dw/ui.hh
+++ b/dw/ui.hh
@@ -231,6 +231,17 @@ protected:
    void sizeRequestImpl (Requisition *requisition);
    void getExtremesImpl (Extremes *extremes);
    void sizeAllocateImpl (Allocation *allocation);
+
+   int getAvailWidthOfChild (Widget *child, bool forceValue);
+   int getAvailHeightOfChild (Widget *child, bool forceValue);
+   void correctRequisitionOfChild (Widget *child,
+                                   Requisition *requisition,
+                                   void (*splitHeightFun) (int, int*, int*));
+   void correctExtremesOfChild (Widget *child, Extremes *extremes,
+                                bool useAdjustmentWidth);
+
+   void containerSizeChangedForChildren ();
+
    void enterNotifyImpl (core::EventCrossing *event);
    void leaveNotifyImpl (core::EventCrossing *event);
    bool buttonPressImpl (core::EventButton *event);
@@ -241,18 +252,27 @@ public:
    Embed(Resource *resource);
    ~Embed();
 
-   void setWidth (int width);
-   void setAscent (int ascent);
-   void setDescent (int descent);
    void setDisplayed (bool displayed);
    void setEnabled (bool enabled);
    void draw (View *view, Rectangle *area);
    Iterator *iterator (Content::Type mask, bool atEnd);
    void setStyle (style::Style *style);
 
-   inline void setUsesHints () { setFlags (USES_HINTS); }
-
    inline Resource *getResource () { return resource; }
+
+   inline void correctReqWidthOfChildNoRec (Widget *child,
+                                            Requisition *requisition)
+   { Widget::correctReqWidthOfChild (child, requisition); }
+
+   inline void correctReqHeightOfChildNoRec (Widget *child,
+                                             Requisition *requisition,
+                                             void (*splitHeightFun) (int, int*,
+                                                                     int*))
+   { Widget::correctReqHeightOfChild (child, requisition, splitHeightFun); }
+
+   virtual void correctExtremesOfChildNoRec (Widget *child, Extremes *extremes,
+                                             bool useAdjustmentWidth)
+   { Widget::correctExtremesOfChild (child, extremes, useAdjustmentWidth); }
 };
 
 /**
@@ -329,16 +349,25 @@ protected:
       clickedEmitter.emitClicked (this, event); }
 
 public:
-   inline Resource () { embed = NULL; }
+   inline Resource ()
+   { embed = NULL; DBG_OBJ_CREATE ("dw::core::ui::Resource"); }
 
    virtual ~Resource ();
 
    virtual void sizeRequest (Requisition *requisition) = 0;
    virtual void getExtremes (Extremes *extremes);
    virtual void sizeAllocate (Allocation *allocation);
-   virtual void setWidth (int width);
-   virtual void setAscent (int ascent);
-   virtual void setDescent (int descent);
+
+   virtual int getAvailWidthOfChild (Widget *child, bool forceValue);
+   virtual int getAvailHeightOfChild (Widget *child, bool forceValue);
+   virtual void correctRequisitionOfChild (Widget *child,
+                                           Requisition *requisition,
+                                           void (*splitHeightFun) (int, int*,
+                                                                   int*));
+   virtual void correctExtremesOfChild (Widget *child, Extremes *extremes,
+                                        bool useAdjustmentWidth);
+   virtual void containerSizeChangedForChildren ();
+
    virtual void setDisplayed (bool displayed);
    virtual void draw (View *view, Rectangle *area);
    virtual Iterator *iterator (Content::Type mask, bool atEnd) = 0;
@@ -377,7 +406,7 @@ private:
    public:
       ComplexButtonResource *resource;
 
-      void canvasSizeChanged (int width, int ascent, int descent);
+      void resizeQueued (bool extremesChanged);
    };
 
    friend class LayoutReceiver;
@@ -406,9 +435,16 @@ public:
    void sizeRequest (Requisition *requisition);
    void getExtremes (Extremes *extremes);
    void sizeAllocate (Allocation *allocation);
-   void setWidth (int width);
-   void setAscent (int ascent);
-   void setDescent (int descent);
+
+   int getAvailWidthOfChild (Widget *child, bool forceValue);
+   int getAvailHeightOfChild (Widget *child, bool forceValue);
+   void correctRequisitionOfChild (Widget *child,
+                                   Requisition *requisition,
+                                   void (*splitHeightFun) (int, int*, int*));
+   void correctExtremesOfChild (Widget *child, Extremes *extremes,
+                                bool useAdjustmentWidth);
+   void containerSizeChangedForChildren ();
+
    Iterator *iterator (Content::Type mask, bool atEnd);
    int getClickX () {return click_x;};
    int getClickY () {return click_y;};