From 0081548434908883d344126245e7f55ea3a5899d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= <spartanj@gmail.com>
Date: Thu, 8 Sep 2022 01:38:12 -0300
Subject: [PATCH] UILinearLayout: fixed issue with wrap_content and childs
 using match_parent.

---
 include/eepp/ui/uilinearlayout.hpp     |   4 +
 src/eepp/ui/tools/uidocfindreplace.cpp |   2 +-
 src/eepp/ui/uilinearlayout.cpp         | 209 +++++++++++++------------
 src/tools/ecode/ecode.hpp              |   2 +-
 4 files changed, 116 insertions(+), 101 deletions(-)

diff --git a/include/eepp/ui/uilinearlayout.hpp b/include/eepp/ui/uilinearlayout.hpp
index ecb3e95fe..bcadf2077 100644
--- a/include/eepp/ui/uilinearlayout.hpp
+++ b/include/eepp/ui/uilinearlayout.hpp
@@ -48,6 +48,10 @@ class EE_API UILinearLayout : public UILayout {
 	void packHorizontal();
 
 	Sizei getTotalUsedSize();
+
+	void applyWidthPolicyOnChilds();
+
+	void applyHeightPolicyOnChilds();
 };
 
 }} // namespace EE::UI
diff --git a/src/eepp/ui/tools/uidocfindreplace.cpp b/src/eepp/ui/tools/uidocfindreplace.cpp
index 870438526..597e9bb0f 100644
--- a/src/eepp/ui/tools/uidocfindreplace.cpp
+++ b/src/eepp/ui/tools/uidocfindreplace.cpp
@@ -104,7 +104,7 @@ const char DOC_FIND_REPLACE_CSS[] = R"css(
 
 const char DOC_FIND_REPLACE_XML[] = R"xml(
 <hbox class="ce_find_replace_box" layout_width="wrap_content" layout_height="wrap_content" layout_gravity="right|top" layout-margin-right="32dp">
-	<!-- <Widget class="expander" layout_width="2dp" layout_height="match_parent" /> -->
+	<Widget class="expander" layout_width="2dp" layout_height="match_parent" />
 	<button class="find_replace_toggle" layout_width="16dp" layout_height="wrap_content" padding="2dp" layout_gravity="center" />
 	<vbox layout_width="wrap_content" layout_height="wrap_content">
 		<hbox layout_width="320dp" layout_height="wrap_content" paddingRight="1dp" min-width="200dp" clip="border-box">
diff --git a/src/eepp/ui/uilinearlayout.cpp b/src/eepp/ui/uilinearlayout.cpp
index 3798375b3..bf7c0a034 100644
--- a/src/eepp/ui/uilinearlayout.cpp
+++ b/src/eepp/ui/uilinearlayout.cpp
@@ -67,49 +67,7 @@ bool UILinearLayout::isPacking() const {
 	return mPacking;
 }
 
-void UILinearLayout::packVertical() {
-	if ( mPacking )
-		return;
-	mPacking = true;
-	bool sizeChanged = false;
-	Sizef size( getPixelsSize() );
-
-	if ( getLayoutWidthPolicy() == SizePolicy::MatchParent && 0 == getLayoutWeight() ) {
-		Float w =
-			getParent()->getPixelsSize().getWidth() - mLayoutMarginPx.Left - mLayoutMarginPx.Right;
-
-		if ( getParent()->isType( UI_TYPE_LAYOUT ) ) {
-			UILayout* pLay = static_cast<UILayout*>( getParent() );
-			w = w - pLay->getPixelsPadding().Left - pLay->getPixelsPadding().Right;
-		}
-
-		if ( (int)w != (int)getPixelsSize().getWidth() ) {
-			sizeChanged = true;
-
-			size.setWidth( w );
-		}
-	}
-
-	if ( getLayoutHeightPolicy() == SizePolicy::MatchParent ) {
-		Float h =
-			getParent()->getPixelsSize().getHeight() - mLayoutMarginPx.Top - mLayoutMarginPx.Bottom;
-
-		if ( getParent()->isType( UI_TYPE_LAYOUT ) ) {
-			UILayout* pLay = static_cast<UILayout*>( getParent() );
-			h = h - pLay->getPixelsPadding().Top - pLay->getPixelsPadding().Bottom;
-		}
-
-		if ( (int)h != (int)getPixelsSize().getHeight() ) {
-			sizeChanged = true;
-
-			size.setHeight( h );
-		}
-	}
-
-	if ( sizeChanged ) {
-		setInternalPixelsSize( size );
-	}
-
+void UILinearLayout::applyWidthPolicyOnChilds() {
 	Node* child = mChild;
 
 	while ( NULL != child ) {
@@ -156,12 +114,106 @@ void UILinearLayout::packVertical() {
 
 		child = child->getNextNode();
 	}
+}
+
+void UILinearLayout::applyHeightPolicyOnChilds() {
+	Node* child = mChild;
+
+	while ( NULL != child ) {
+		if ( child->isWidget() && child->isVisible() ) {
+			UIWidget* widget = static_cast<UIWidget*>( child );
+
+			if ( widget->getLayoutWidthPolicy() == SizePolicy::WrapContent ) {
+				widget->setFlags( UI_AUTO_SIZE );
+			}
+
+			switch ( widget->getLayoutHeightPolicy() ) {
+				case SizePolicy::WrapContent: {
+					widget->setFlags( UI_AUTO_SIZE );
+					break;
+				}
+				case SizePolicy::MatchParent: {
+					int h = getPixelsSize().getHeight() - widget->getLayoutPixelsMargin().Top -
+							widget->getLayoutPixelsMargin().Bottom - mPaddingPx.Top -
+							mPaddingPx.Bottom;
+
+					if ( h != (int)widget->getPixelsSize().getHeight() && h > 0 )
+						widget->setPixelsSize( widget->getPixelsSize().getWidth(), h );
+
+					break;
+				}
+				case SizePolicy::Fixed:
+				default: {
+				}
+			}
+
+			if ( widget->getLayoutWidthPolicy() == SizePolicy::MatchParent &&
+				 widget->getLayoutWeight() == 0 &&
+				 widget->getPixelsSize().getWidth() != getPixelsSize().getWidth() -
+														   widget->getLayoutPixelsMargin().Left -
+														   widget->getLayoutPixelsMargin().Right -
+														   mPaddingPx.Left - mPaddingPx.Right ) {
+				widget->setPixelsSize(
+					getPixelsSize().getWidth() - widget->getLayoutPixelsMargin().Left -
+						widget->getLayoutPixelsMargin().Right - mPaddingPx.Left - mPaddingPx.Right,
+					widget->getPixelsSize().getHeight() );
+			}
+		}
+
+		child = child->getNextNode();
+	}
+}
+
+void UILinearLayout::packVertical() {
+	if ( mPacking )
+		return;
+	mPacking = true;
+	bool sizeChanged = false;
+	Sizef size( getPixelsSize() );
+
+	if ( getLayoutWidthPolicy() == SizePolicy::MatchParent && 0 == getLayoutWeight() ) {
+		Float w =
+			getParent()->getPixelsSize().getWidth() - mLayoutMarginPx.Left - mLayoutMarginPx.Right;
+
+		if ( getParent()->isType( UI_TYPE_LAYOUT ) ) {
+			UILayout* pLay = static_cast<UILayout*>( getParent() );
+			w = w - pLay->getPixelsPadding().Left - pLay->getPixelsPadding().Right;
+		}
+
+		if ( (int)w != (int)getPixelsSize().getWidth() ) {
+			sizeChanged = true;
+
+			size.setWidth( w );
+		}
+	}
+
+	if ( getLayoutHeightPolicy() == SizePolicy::MatchParent ) {
+		Float h =
+			getParent()->getPixelsSize().getHeight() - mLayoutMarginPx.Top - mLayoutMarginPx.Bottom;
+
+		if ( getParent()->isType( UI_TYPE_LAYOUT ) ) {
+			UILayout* pLay = static_cast<UILayout*>( getParent() );
+			h = h - pLay->getPixelsPadding().Top - pLay->getPixelsPadding().Bottom;
+		}
+
+		if ( (int)h != (int)getPixelsSize().getHeight() ) {
+			sizeChanged = true;
+
+			size.setHeight( h );
+		}
+	}
+
+	if ( sizeChanged ) {
+		setInternalPixelsSize( size );
+	}
+
+	applyWidthPolicyOnChilds();
 
 	Float curY = mPaddingPx.Top;
 	Float maxX = 0;
 	Sizei freeSize = getTotalUsedSize();
 
-	child = mChild;
+	Node* child = mChild;
 
 	while ( NULL != child ) {
 		if ( child->isWidget() && child->isVisible() ) {
@@ -178,8 +230,7 @@ void UILinearLayout::packVertical() {
 						? getPixelsSize().getHeight() - mPaddingPx.Top - mPaddingPx.Bottom
 						: getParent()->getPixelsSize().getHeight() - mLayoutMarginPx.Bottom -
 							  mLayoutMarginPx.Top - mPaddingPx.Top - mPaddingPx.Bottom;
-				Float size =
-					( Float )( totSize - freeSize.getHeight() ) * widget->getLayoutWeight();
+				Float size = (Float)( totSize - freeSize.getHeight() ) * widget->getLayoutWeight();
 
 				widget->setPixelsSize( widget->getPixelsSize().getWidth(), (Int32)size );
 			}
@@ -205,9 +256,11 @@ void UILinearLayout::packVertical() {
 
 			curY += eeceil( widget->getPixelsSize().getHeight() + margin.Bottom );
 
-			maxX = eeceil( eemax( maxX, ( widget->getPixelsSize().getWidth() +
-										  widget->getLayoutPixelsMargin().Left +
-										  widget->getLayoutPixelsMargin().Right ) ) );
+			if ( widget->getLayoutWidthPolicy() != SizePolicy::MatchParent ) {
+				maxX = eeceil( eemax( maxX, ( widget->getPixelsSize().getWidth() +
+											  widget->getLayoutPixelsMargin().Left +
+											  widget->getLayoutPixelsMargin().Right ) ) );
+			}
 		}
 
 		child = child->getNextNode();
@@ -295,57 +348,13 @@ void UILinearLayout::packHorizontal() {
 		setInternalPixelsSize( size );
 	}
 
-	Node* child = mChild;
-
-	while ( NULL != child ) {
-		if ( child->isWidget() && child->isVisible() ) {
-			UIWidget* widget = static_cast<UIWidget*>( child );
-
-			if ( widget->getLayoutWidthPolicy() == SizePolicy::WrapContent ) {
-				widget->setFlags( UI_AUTO_SIZE );
-			}
-
-			switch ( widget->getLayoutHeightPolicy() ) {
-				case SizePolicy::WrapContent: {
-					widget->setFlags( UI_AUTO_SIZE );
-					break;
-				}
-				case SizePolicy::MatchParent: {
-					int h = getPixelsSize().getHeight() - widget->getLayoutPixelsMargin().Top -
-							widget->getLayoutPixelsMargin().Bottom - mPaddingPx.Top -
-							mPaddingPx.Bottom;
-
-					if ( h != (int)widget->getPixelsSize().getHeight() && h > 0 )
-						widget->setPixelsSize( widget->getPixelsSize().getWidth(), h );
-
-					break;
-				}
-				case SizePolicy::Fixed:
-				default: {
-				}
-			}
-
-			if ( widget->getLayoutWidthPolicy() == SizePolicy::MatchParent &&
-				 widget->getLayoutWeight() == 0 &&
-				 widget->getPixelsSize().getWidth() != getPixelsSize().getWidth() -
-														   widget->getLayoutPixelsMargin().Left -
-														   widget->getLayoutPixelsMargin().Right -
-														   mPaddingPx.Left - mPaddingPx.Right ) {
-				widget->setPixelsSize(
-					getPixelsSize().getWidth() - widget->getLayoutPixelsMargin().Left -
-						widget->getLayoutPixelsMargin().Right - mPaddingPx.Left - mPaddingPx.Right,
-					widget->getPixelsSize().getHeight() );
-			}
-		}
-
-		child = child->getNextNode();
-	}
+	applyHeightPolicyOnChilds();
 
 	Float curX = mPaddingPx.Left;
 	Float maxY = 0;
 	Sizei freeSize = getTotalUsedSize();
 
-	child = mChild;
+	Node* child = mChild;
 
 	while ( NULL != child ) {
 		if ( child->isWidget() && child->isVisible() ) {
@@ -362,7 +371,7 @@ void UILinearLayout::packHorizontal() {
 						? getPixelsSize().getWidth() - mPaddingPx.Left - mPaddingPx.Right
 						: getParent()->getPixelsSize().getWidth() - mLayoutMarginPx.Right -
 							  mLayoutMarginPx.Left - mPaddingPx.Left - mPaddingPx.Right;
-				Float size = ( Float )( totSize - freeSize.getWidth() ) * widget->getLayoutWeight();
+				Float size = (Float)( totSize - freeSize.getWidth() ) * widget->getLayoutWeight();
 
 				widget->setPixelsSize( (Int32)size, widget->getPixelsSize().getHeight() );
 			}
@@ -388,9 +397,11 @@ void UILinearLayout::packHorizontal() {
 
 			curX += eeceil( widget->getPixelsSize().getWidth() + margin.Right );
 
-			maxY = eeceil( eemax( maxY, ( widget->getPixelsSize().getHeight() +
-										  widget->getLayoutPixelsMargin().Top +
-										  widget->getLayoutPixelsMargin().Bottom ) ) );
+			if ( widget->getLayoutHeightPolicy() != SizePolicy::MatchParent ) {
+				maxY = eeceil( eemax( maxY, ( widget->getPixelsSize().getHeight() +
+											  widget->getLayoutPixelsMargin().Top +
+											  widget->getLayoutPixelsMargin().Bottom ) ) );
+			}
 		}
 
 		child = child->getNextNode();
diff --git a/src/tools/ecode/ecode.hpp b/src/tools/ecode/ecode.hpp
index 04887537d..7e5dad426 100644
--- a/src/tools/ecode/ecode.hpp
+++ b/src/tools/ecode/ecode.hpp
@@ -189,7 +189,7 @@ class App : public UICodeEditorSplitter::Client {
 	std::shared_ptr<ProjectDirectoryTree> mDirTree;
 	UITreeView* mProjectTreeView{ nullptr };
 	std::shared_ptr<FileSystemModel> mFileSystemModel;
-	size_t mMenuIconSize;
+	size_t mMenuIconSize{ 16 };
 	bool mDirTreeReady{ false };
 	bool mIsBundledApp{ false };
 	bool mUseFrameBuffer{ false };