Math module improvements.

--HG--
branch : dev
This commit is contained in:
Martín Lucas Golini
2017-02-17 19:16:39 -03:00
parent cee1075c9e
commit fdf67752a3
74 changed files with 769 additions and 769 deletions

View File

@@ -162,8 +162,8 @@ void UITextInput::alignFix() {
if ( !mTextBuffer.setSupportNewLine() ) {
if ( tX < 0.f )
mAlignOffset.x = -( mAlignOffset.x + ( tW - mAlignOffset.x ) );
else if ( tX > mSize.width() - mPadding.Left - mPadding.Right )
mAlignOffset.x = mSize.width() - mPadding.Left - mPadding.Right - ( mAlignOffset.x + ( tW - mAlignOffset.x ) );
else if ( tX > mSize.getWidth() - mPadding.Left - mPadding.Right )
mAlignOffset.x = mSize.getWidth() - mPadding.Left - mPadding.Right - ( mAlignOffset.x + ( tW - mAlignOffset.x ) );
}
}
}
@@ -177,7 +177,7 @@ void UITextInput::setTheme( UITheme * Theme ) {
void UITextInput::autoSize() {
if ( mFlags & UI_AUTO_SIZE ) {
size( mSize.x, getSkinSize().height() );
size( mSize.x, getSkinSize().getHeight() );
}
}