From 2cefda0e49830d6ca348f37300bb53bffccb4568 Mon Sep 17 00:00:00 2001 From: Sebastian Geerken Date: Mon, 5 Jan 2015 14:55:34 +0100 Subject: Extremes::adjustmentWidth may now (again) be used for extremes correction. --- dw/widget.hh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'dw/widget.hh') 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, -- cgit v1.2.3