ScrollArea's behavior of 'max' layout parameter changed

src/morda/widgets/Container.cpp

@@ -310,7 +310,7 @@ Vec2r Container::dimForWidget(const Widget& w, const LayoutParams& lp)const{
 		if(lp.dim[i] == LayoutParams::max_c || lp.dim[i] == LayoutParams::fill_c){
 			d[i] = this->rect().d[i];
 		}else if(lp.dim[i] == LayoutParams::min_c){
-			d[i] = -1; //will be updated below
+			d[i] = -1; // will be updated below
 		}else{
 			d[i] = lp.dim[i];
 		}

src/morda/widgets/group/ScrollArea.cpp

@@ -84,6 +84,32 @@ void ScrollArea::updateScrollFactor(){
 	}
 }
 
+Vec2r ScrollArea::dimForWidget(const Widget& w, const LayoutParams& lp)const{
+	Vec2r d;
+	for(unsigned i = 0; i != 2; ++i){
+		if(lp.dim[i] == LayoutParams::fill_c){
+			d[i] = this->rect().d[i];
+		}else if(lp.dim[i] == LayoutParams::min_c || lp.dim[i] == LayoutParams::max_c){
+			d[i] = -1; // will be updated below
+		}else{
+			d[i] = lp.dim[i];
+		}
+	}
+	if(d.x < 0 || d.y < 0){
+		Vec2r md = w.measure(d);
+		for(unsigned i = 0; i != md.size(); ++i){
+			if(d[i] < 0){
+				if(lp.dim[i] == LayoutParams::max_c && md[i] < this->rect().d[i]){
+					d[i] = this->rect().d[i];
+				}else{
+					d[i] = md[i];
+				}
+			}
+		}
+	}
+	return d;
+}
+
 void ScrollArea::arrangeWidgets() {
 	for(auto i = this->children().begin(); i != this->children().end(); ++i){
 		auto& lp = this->getLayoutParams(**i);

src/morda/widgets/group/ScrollArea.hpp

@@ -12,6 +12,10 @@ namespace morda{
  * @brief Scroll area container widget.
  * Scroll area is a container which can add an offset to its children widget positions.
  * From GUI scripts it can be instantiated as "ScrollArea".
+ * Note, that Scrollarea has same layout parameters as simple Container and those work similarly,
+ * except 'max' value. If layout dimension is specified as 'max' then child widget will be stretched to the
+ * parent (ScrollArea) size in case child's minimal size is less than ScrollArea size, otherwise child will be assigned
+ * its minimal size.
  */
 class ScrollArea : public Container{
 	//offset from top left corner
@@ -23,6 +27,9 @@ class ScrollArea : public Container{
 	//cached scroll factor
 	Vec2r curScrollFactor;
 
+protected:
+	Vec2r dimForWidget(const Widget& w, const LayoutParams& lp)const;
+
 public:
 	ScrollArea(const stob::Node* chain);
 

tests/app/res/test.gui

@@ -589,7 +589,7 @@ Container{
 //							image{img_camera}
 
 							layout{
-								dx{min} dy{min}
+								dx{min} dy{max}
 							}
 						}