Ctrl+A, Ctrl+V blocked while Editing token

Change-Id: I4a3582deace7bab466627e607725d85fa7808ee8
Signed-off-by: Kunal Sinha <kunal.sinha@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index ebb8829..df5d635 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -8676,7 +8676,6 @@ float
 _EditPresenter::CalculateMaximumFlexibleHeight(void)
 {
        float maxHeight = 0.0f;
-       float expectedEditHeight = __pTextObject->GetTotalHeightF() + __verticalMargin;
        int maximumFlexibleLineNumber = GetMaxLineCount();
 
        if (maximumFlexibleLineNumber > 0) // if max line number is set.

diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
index c8c308f..a811f10 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -3670,4 +3670,30 @@ _TokenEditPresenter::OnBoundsChanged(void)
        return;
 }
 
+bool
+_TokenEditPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
+{
+       _KeyCode keyCode = keyInfo.GetKeyCode();
+
+       if (IsUsbKeyboardConnected() && (keyInfo.GetKeyModifier() & _KEY_MODIFIER_CTRL))
+       {
+               switch (keyCode)
+               {
+               case _KEY_A:
+               case _KEY_C:
+               case _KEY_X:
+               case _KEY_V:
+                       if (__isEditingToken)
+                       {
+                               return true;
+                       }
+                       break;
+
+               default:
+                       break;
+               }
+       }
+
+       return _EditPresenter::OnKeyPressed(source, keyInfo);
+}
 }}} //Tizen::Ui::Controls

diff --git a/src/ui/inc/FUiCtrl_TokenEditPresenter.h b/src/ui/inc/FUiCtrl_TokenEditPresenter.h
index b065b45..b8a85ea 100644 (file)
--- a/src/ui/inc/FUiCtrl_TokenEditPresenter.h
+++ b/src/ui/inc/FUiCtrl_TokenEditPresenter.h
@@ -156,6 +156,7 @@ public:
        virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
        virtual result ChangeLayout(_ControlOrientation orientation);
        virtual void ResetTextBounds(void);
+       virtual bool OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo);
 
 private:
        bool DrawToken(int count = -1);