Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-11 17:17:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

A couple of fixes for the grid layout.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Martín Lucas Golini
2017-07-25 16:07:02 -03:00
parent 93891cda44
commit e79df67ea3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/eepp/ui/uigridlayout.cpp
View File

@@ -156,7 +156,7 @@ void UIGridLayout::pack() {
pos.x += getHorizontalAlign() == UI_HALIGN_RIGHT ? -targetSize.getWidth() : targetSize.getWidth();
if ( pos.x < mPadding.Left || pos.x + targetSize.x > mSize.getWidth() - mPadding.Right ) {
if ( pos.x < mPadding.Left || pos.x + targetSize.x > mSize.getWidth() - mPadding.Right || pos.x + targetSize.x + mSpan.x > mSize.getWidth() - mPadding.Right ) {
pos.x = getHorizontalAlign() == UI_HALIGN_RIGHT ? mSize.getWidth() - mPadding.Right : mPadding.Left;
pos.y += targetSize.getHeight() + mSpan.y;
@@ -199,9 +199,9 @@ void UIGridLayout::loadFromXmlNode(const pugi::xml_node & node) {
String::toLowerInPlace( name );
if ( "columnspan" == name ) {
setSpan( Sizei( mSpan.x, ait->as_int() ) );
} else if ( "rowspan" == name ) {
setSpan( Sizei( ait->as_int(), mSpan.y ) );
} else if ( "rowspan" == name ) {
setSpan( Sizei( mSpan.x, ait->as_int() ) );
} else if ( "span" == name ) {
setSpan( Sizei( ait->as_int(), ait->as_int() ) );
} else if ( "columnmode" == name ) {