Handling nested layouts (e. g. <button>), part 2.

1 files changed, 37 insertions, 0 deletions

diff --git a/dw/ui.hh b/dw/ui.hh
index 98c90ed6..49ca9a6d 100644
--- a/dw/ui.hh
+++ b/dw/ui.hh
@@ -231,7 +231,16 @@ 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);
+
    void containerSizeChangedForChildren ();
+
    void enterNotifyImpl (core::EventCrossing *event);
    void leaveNotifyImpl (core::EventCrossing *event);
    bool buttonPressImpl (core::EventButton *event);
@@ -249,6 +258,19 @@ public:
    void setStyle (style::Style *style);
 
    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)
+   { Widget::correctExtremesOfChild (child, extremes); }
 };
 
 /**
@@ -333,6 +355,15 @@ public:
    virtual void sizeRequest (Requisition *requisition) = 0;
    virtual void getExtremes (Extremes *extremes);
    virtual void sizeAllocate (Allocation *allocation);
+
+   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);
+
    virtual void setDisplayed (bool displayed);
    virtual void draw (View *view, Rectangle *area);
    virtual Iterator *iterator (Content::Type mask, bool atEnd) = 0;
@@ -400,6 +431,12 @@ public:
    void sizeRequest (Requisition *requisition);
    void getExtremes (Extremes *extremes);
    void sizeAllocate (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);
    Iterator *iterator (Content::Type mask, bool atEnd);
    int getClickX () {return click_x;};
    int getClickY () {return click_y;};