UITextView fix.

--HG--
branch : dev
This commit is contained in:
Martín Lucas Golini
2017-08-03 11:54:39 -03:00
parent aed0c04835
commit 882dacfca5
4 changed files with 6 additions and 3 deletions

View File

@@ -16,7 +16,7 @@ enum UI_CONTROL_FLAGS_VALUES {
UI_CTRL_FLAG_MOUSEOVER_ME_OR_CHILD = (1<<7),
UI_CTRL_FLAG_DRAGGING = (1<<8),
UI_CTRL_FLAG_DRAGABLE = (1<<9),
UI_CTRL_FLAG_COMPLEX = (1<<10),
UI_CTRL_FLAG_WIDGET = (1<<10),
UI_CTRL_FLAG_SKIN_OWNER = (1<<11),
UI_CTRL_FLAG_TOUCH_DRAGGING = (1<<12),
UI_CTRL_FLAG_DISABLED_BY_MODAL_WINDOW = (1<<13),

View File

@@ -1107,7 +1107,7 @@ Uint32 UIControl::isDragable() {
}
Uint32 UIControl::isWidget() {
return mControlFlags & UI_CTRL_FLAG_COMPLEX;
return mControlFlags & UI_CTRL_FLAG_WIDGET;
}
Uint32 UIControl::isClipped() {

View File

@@ -21,6 +21,9 @@ UITextView::UITextView() :
mLastSelCurInit( -1 ),
mLastSelCurEnd( -1 )
{
mLayoutWidthRules = FIXED;
mLayoutHeightRules = FIXED;
mFontStyleConfig = UIThemeManager::instance()->getDefaultFontStyleConfig();
mTextCache = eeNew( Text, () );

View File

@@ -20,7 +20,7 @@ UIWidget::UIWidget() :
mLayoutPositionRule(NONE),
mLayoutPositionRuleWidget(NULL)
{
mControlFlags |= UI_CTRL_FLAG_COMPLEX;
mControlFlags |= UI_CTRL_FLAG_WIDGET;
updateAnchorsDistances();
}