diff options
| author | Sebastian Geerken <devnull@localhost> | 2015-01-05 14:55:34 +0100 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2015-01-05 14:55:34 +0100 |
| commit | 2cefda0e49830d6ca348f37300bb53bffccb4568 (patch) | |
| tree | f58e1e87408d21c77805cb29f17b791620c05878 /dw/widget.hh | |
| parent | f63ff25447f9b0face656cfd18d97130409b2c17 (diff) | |
Extremes::adjustmentWidth may now (again) be used for extremes correction.
Diffstat (limited to 'dw/widget.hh')
| -rw-r--r-- | dw/widget.hh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dw/widget.hh b/dw/widget.hh index bef35715..f9d1293c 100644 --- a/dw/widget.hh +++ b/dw/widget.hh @@ -292,7 +292,7 @@ protected: */ virtual void markExtremesChange (int ref); - int getMinWidth (Extremes *extremes, bool useCorrected, bool forceValue); + int getMinWidth (Extremes *extremes, bool forceValue); virtual int getAvailWidthOfChild (Widget *child, bool forceValue); virtual int getAvailHeightOfChild (Widget *child, bool forceValue); @@ -303,7 +303,8 @@ protected: void correctReqWidthOfChild (Widget *child, Requisition *requisition); void correctReqHeightOfChild (Widget *child, Requisition *requisition, void (*splitHeightFun) (int, int*, int*)); - virtual void correctExtremesOfChild (Widget *child, Extremes *extremes); + virtual void correctExtremesOfChild (Widget *child, Extremes *extremes, + bool useAdjustmentWidth); virtual void containerSizeChangedForChildren (); @@ -430,7 +431,7 @@ public: virtual bool getAdjustMinWidth () { return Widget::adjustMinWidth; } void correctRequisition (Requisition *requisition, void (*splitHeightFun) (int, int*, int*)); - void correctExtremes (Extremes *extremes); + void correctExtremes (Extremes *extremes, bool useAdjustmentWidth); int calcWidth (style::Length cssValue, int refWidth, Widget *refWidget, int limitMinWidth, bool forceValue); void calcFinalWidth (style::Style *style, int refWidth, Widget *refWidget, |