Home Explore Help
Sign In
cpp
/
urho3d
mirror of https://github.com/urho3d/urho3d.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Allow UIElements to keep their current size if greater than the calculated size during layout updates.

PrimitiveWaste 11 years ago
parent
11cb6e05b6
commit
b97c8d4712
1 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 2 2
      Source/Engine/UI/UIElement.cpp

+ 2 - 2
Source/Engine/UI/UIElement.cpp
View File 

@@ -1055,7 +1055,7 @@ void UIElement::UpdateLayout()
 
 

         CalculateLayout(positions, sizes, minSizes, maxSizes, GetWidth(), layoutBorder_.left_, layoutBorder_.right_, layoutSpacing_);

 

-        int width = CalculateLayoutParentSize(sizes, layoutBorder_.left_, layoutBorder_.right_, layoutSpacing_);

+        int width = Max(GetWidth(), CalculateLayoutParentSize(sizes, layoutBorder_.left_, layoutBorder_.right_, layoutSpacing_));

         int height = Max(GetHeight(), minChildHeight + layoutBorder_.top_ + layoutBorder_.bottom_);

         int minWidth = Min(CalculateLayoutParentSize(minSizes, layoutBorder_.left_, layoutBorder_.right_, layoutSpacing_), maxSize_.x_);

         int minHeight = Min(minChildHeight + layoutBorder_.top_ + layoutBorder_.bottom_, maxSize_.y_);

@@ -1096,7 +1096,7 @@ void UIElement::UpdateLayout()
 
 

         CalculateLayout(positions, sizes, minSizes, maxSizes, GetHeight(), layoutBorder_.top_, layoutBorder_.bottom_, layoutSpacing_);

 

-        int height = CalculateLayoutParentSize(sizes, layoutBorder_.top_, layoutBorder_.bottom_, layoutSpacing_);

+        int height = Max(GetHeight(), CalculateLayoutParentSize(sizes, layoutBorder_.top_, layoutBorder_.bottom_, layoutSpacing_));

         int width = Max(GetWidth(), minChildWidth + layoutBorder_.left_ + layoutBorder_.right_);

         int minHeight = Min(CalculateLayoutParentSize(minSizes, layoutBorder_.top_, layoutBorder_.bottom_, layoutSpacing_), maxSize_.y_);

         int minWidth = Min(minChildWidth + layoutBorder_.left_ + layoutBorder_.right_, maxSize_.x_);