From c59438a72e589657cf09aa0eeeb6a42a5800e144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Mon, 9 Jul 2018 01:22:34 -0300 Subject: [PATCH] LinearLayout match parent fix. --HG-- branch : dev --- src/eepp/ui/uilinearlayout.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/eepp/ui/uilinearlayout.cpp b/src/eepp/ui/uilinearlayout.cpp index bd7cad565..8b47e6f43 100644 --- a/src/eepp/ui/uilinearlayout.cpp +++ b/src/eepp/ui/uilinearlayout.cpp @@ -109,7 +109,7 @@ void UILinearLayout::packVertical() { } if ( widget->getLayoutHeightRules() == MATCH_PARENT && widget->getLayoutWeight() == 0 && widget->getSize().getHeight() != mDpSize.getHeight() ) { - widget->setSize( widget->getSize().getWidth(), mDpSize.getHeight() ); + widget->setSize( widget->getSize().getWidth(), mDpSize.getHeight() - widget->getLayoutMargin().Top - widget->getLayoutMargin().Bottom ); } } @@ -223,7 +223,7 @@ void UILinearLayout::packHorizontal() { } if ( widget->getLayoutWidthRules() == MATCH_PARENT && widget->getLayoutWeight() == 0 && widget->getSize().getWidth() != mDpSize.getWidth() ) { - widget->setSize( mDpSize.getWidth(), widget->getSize().getWidth() ); + widget->setSize( mDpSize.getWidth(), widget->getSize().getWidth() - widget->getLayoutMargin().Left - widget->getLayoutMargin().Top ); } }