apply float parse and fixed bug

Change-Id: Id759eac0a0d9757d9c89101c5c03549e37f69e16

diff --git a/src/ui/controls/FUiCtrl_EditAreaImpl.cpp b/src/ui/controls/FUiCtrl_EditAreaImpl.cpp
index 9b53a32..dbc8e43 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditAreaImpl.cpp
+++ b/src/ui/controls/FUiCtrl_EditAreaImpl.cpp
@@ -1584,11 +1584,11 @@ protected:
                HorizontalAlignment horizontalAlignment = ALIGNMENT_LEFT;
                bool viewModeEnable = false;
                bool commandButtonVisible = false;
-               int fontSize = 0;
+               float fontSize = 0.0f;
                Color color;
                int opacity = EDIT_COLOR_OPACITY;
-               int horizontalMargin = 0;
-               int verticalMargin = 0;
+               float horizontalMargin = 0.0f;
+               float verticalMargin = 0.0f;
 
                GetProperty(pControl, &pControlProperty);
                if (pControlProperty == null)
@@ -1769,7 +1769,7 @@ protected:
 
                if (pControl->GetElement(L"textSize", elementString))
                {
-                       Base::Integer::Parse(elementString, fontSize);
+                       Base::Float::Parse(elementString, fontSize);
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {
@@ -1905,13 +1905,13 @@ protected:
 
                if (pControl->GetElement(L"horizontalMargin", elementString))
                {
-                       Base::Integer::Parse(elementString, horizontalMargin);
+                       Base::Float::Parse(elementString, horizontalMargin);
                        r = pEditArea->SetMargin(EDIT_MARGIN_TYPE_HORIZONTAL, horizontalMargin);
                }
 
                if (pControl->GetElement(L"verticalMargin", elementString))
                {
-                       Base::Integer::Parse(elementString, verticalMargin);
+                       Base::Float::Parse(elementString, verticalMargin);
                        r = pEditArea->SetMargin(EDIT_MARGIN_TYPE_VERTICAL, verticalMargin);
                }
                

diff --git a/src/ui/controls/FUiCtrl_EditFieldImpl.cpp b/src/ui/controls/FUiCtrl_EditFieldImpl.cpp
index 915bd2c..881a471 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditFieldImpl.cpp
+++ b/src/ui/controls/FUiCtrl_EditFieldImpl.cpp
@@ -1832,15 +1832,15 @@ protected:
                HorizontalAlignment horizontalAlignment = ALIGNMENT_LEFT;
                bool viewModeEnable = false;
                bool commandButtonVisible = false;
-               int fontSize = 0;
+               float fontSize = 0.0f;
                Color color;
                int opacity = EDIT_COLOR_OPACITY;
                EditFieldStyle editFieldStyle = EDIT_FIELD_STYLE_NORMAL;
                EditFieldTitleStyle editFieldTitleStyle = EDIT_FIELD_TITLE_STYLE_NONE;
                bool clearButtonEnable = false;
                bool newConstructEnable = false;
-               int horizontalMargin = 0;
-               int verticalMargin = 0;
+               float horizontalMargin = 0.0f;
+               float verticalMargin = 0.0f;
                EllipsisPosition ellipsisPosition = ELLIPSIS_POSITION_END;
 
                GetProperty(pControl, &pControlProperty);
@@ -2132,7 +2132,7 @@ protected:
 
                if (pControl->GetElement(L"textSize", elementString))
                {
-                       Base::Integer::Parse(elementString, fontSize);
+                       Base::Float::Parse(elementString, fontSize);
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {
@@ -2271,13 +2271,13 @@ protected:
 
                if (pControl->GetElement(L"horizontalMargin", elementString))
                {
-                       Base::Integer::Parse(elementString, horizontalMargin);
+                       Base::Float::Parse(elementString, horizontalMargin);
                        r = pEditField->SetMargin(EDIT_MARGIN_TYPE_HORIZONTAL, horizontalMargin);
                }
 
                if (pControl->GetElement(L"verticalMargin", elementString))
                {
-                       Base::Integer::Parse(elementString, verticalMargin);
+                       Base::Float::Parse(elementString, verticalMargin);
                        r = pEditField->SetMargin(EDIT_MARGIN_TYPE_VERTICAL, verticalMargin);
                }
 

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 47d58f5..04e3332 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -4154,6 +4154,8 @@ _EditPresenter::RemoveTextBlock(void)
 
        __isTextBlocked = false;
 
+       InitializeCopyPasteManager();
+
        return r;
 }
 
@@ -5418,7 +5420,10 @@ _EditPresenter::OnFrameRestored(const _Frame& source)
 bool
 _EditPresenter::OnFocusLost(void)
 {
-       InitializeCopyPasteManager();
+       if (!__pEdit->IsDestroyed())
+       {
+               InitializeCopyPasteManager();
+       }
 
        if (__isAutoShrinkEnabled)
        {

diff --git a/src/ui/controls/FUiCtrl_ExpandableEditAreaImpl.cpp b/src/ui/controls/FUiCtrl_ExpandableEditAreaImpl.cpp
index b00d65d..ff35d96 100644 (file)
--- a/src/ui/controls/FUiCtrl_ExpandableEditAreaImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ExpandableEditAreaImpl.cpp
@@ -1635,10 +1635,10 @@ protected:
                KeypadStyle keypadStyle = KEYPAD_STYLE_NORMAL;
                int maxLines = 10;
                String guideText;
-               int verticalMarin = 0;
-               int horizontalMargin = 0;
+               float verticalMarin = 0.0f;
+               float horizontalMargin = 0.0f;
                String text;
-               int textSize = 6;
+               float textSize = 6.0f;
                String titleText;
                int limitLength = 0;
                int opacity = 100;
@@ -1802,7 +1802,7 @@ protected:
 
                if (pControl->GetElement(L"textSize", elementString))
                {
-                       Base::Integer::Parse(elementString, textSize);
+                       Base::Float::Parse(elementString, textSize);
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {
@@ -1813,13 +1813,13 @@ protected:
 
                if (pControl->GetElement(L"verticalMargin", elementString))
                {
-                       Base::Integer::Parse(elementString, verticalMarin);
+                       Base::Float::Parse(elementString, verticalMarin);
                        r = pExpandableEditArea->SetMargin(EDIT_MARGIN_TYPE_VERTICAL, verticalMarin);
                }
 
                if (pControl->GetElement(L"horizontalMargin", elementString))
                {
-                       Base::Integer::Parse(elementString, horizontalMargin);
+                       Base::Float::Parse(elementString, horizontalMargin);
                        r = pExpandableEditArea->SetMargin(EDIT_MARGIN_TYPE_HORIZONTAL, horizontalMargin);
                }
 

diff --git a/src/ui/controls/FUiCtrl_TextBoxImpl.cpp b/src/ui/controls/FUiCtrl_TextBoxImpl.cpp
index 919ca9b..426df5d 100644 (file)
--- a/src/ui/controls/FUiCtrl_TextBoxImpl.cpp
+++ b/src/ui/controls/FUiCtrl_TextBoxImpl.cpp
@@ -649,8 +649,8 @@ protected:
                String text;
                Color color;
                int opacity = 100;
-               int textSize = 0;
-               int lineSpacingExtra = 0;
+               float textSize = 0.0f;
+               float lineSpacingExtra = 0.0f;
                int lineSpacingMultiplier = 1;
                String elementString;
 
@@ -709,7 +709,7 @@ protected:
 
                if (pControl->GetElement("textSize", elementString))
                {
-                       Base::Integer::Parse(elementString, textSize);
+                       Base::Float::Parse(elementString, textSize);
                        _ICoordinateSystemTransformer* pTransform = GetTransformer();
                        if (pTransform)
                        {
@@ -720,7 +720,7 @@ protected:
 
                if (pControl->GetElement("lineSpacingExtra", elementString))
                {
-                       Base::Integer::Parse(elementString, lineSpacingExtra);
+                       Base::Float::Parse(elementString, lineSpacingExtra);
 
                        if (pControl->GetElement("lineSpacingMultiplier", elementString))
                        {