projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dali-Text: Keyboard Shortcuts
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller.cpp
diff --git
a/dali-toolkit/internal/text/text-controller.cpp
b/dali-toolkit/internal/text/text-controller.cpp
index
3b9e532
..
48036ad
100755
(executable)
--- a/
dali-toolkit/internal/text/text-controller.cpp
+++ b/
dali-toolkit/internal/text/text-controller.cpp
@@
-53,6
+53,8
@@
const std::string EMPTY_STRING("");
const std::string KEY_C_NAME = "c";
const std::string KEY_V_NAME = "v";
const std::string KEY_X_NAME = "x";
const std::string KEY_C_NAME = "c";
const std::string KEY_V_NAME = "v";
const std::string KEY_X_NAME = "x";
+const std::string KEY_A_NAME = "a";
+const std::string KEY_INSERT_NAME = "Insert";
const char * const PLACEHOLDER_TEXT = "text";
const char * const PLACEHOLDER_TEXT_FOCUSED = "textFocused";
const char * const PLACEHOLDER_TEXT = "text";
const char * const PLACEHOLDER_TEXT_FOCUSED = "textFocused";
@@
-2905,12
+2907,12
@@
bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent )
// Do nothing
return false;
}
// Do nothing
return false;
}
- else if ( keyEvent.IsCtrlModifier() )
+ else if ( keyEvent.IsCtrlModifier()
&& !keyEvent.IsShiftModifier()
)
{
bool consumed = false;
{
bool consumed = false;
- if (keyName == KEY_C_NAME)
+ if (keyName == KEY_C_NAME
|| keyName == KEY_INSERT_NAME
)
{
{
- // Ctrl-C to copy the selected text
+ // Ctrl-C
or Ctrl+Insert
to copy the selected text
TextPopupButtonTouched( Toolkit::TextSelectionPopup::COPY );
consumed = true;
}
TextPopupButtonTouched( Toolkit::TextSelectionPopup::COPY );
consumed = true;
}
@@
-2926,6
+2928,12
@@
bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent )
TextPopupButtonTouched( Toolkit::TextSelectionPopup::CUT );
consumed = true;
}
TextPopupButtonTouched( Toolkit::TextSelectionPopup::CUT );
consumed = true;
}
+ else if (keyName == KEY_A_NAME)
+ {
+ // Ctrl-A to select All the text
+ TextPopupButtonTouched( Toolkit::TextSelectionPopup::SELECT_ALL );
+ consumed = true;
+ }
return consumed;
}
else if( ( Dali::DALI_KEY_BACKSPACE == keyCode ) ||
return consumed;
}
else if( ( Dali::DALI_KEY_BACKSPACE == keyCode ) ||
@@
-3091,14
+3099,14
@@
void Controller::TapEvent( unsigned int tapCount, float x, float y )
mImpl->ResetInputMethodContext();
}
mImpl->ResetInputMethodContext();
}
-void Controller::PanEvent( Gesture
::
State state, const Vector2& displacement )
+void Controller::PanEvent( GestureState state, const Vector2& displacement )
{
DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" );
if( NULL != mImpl->mEventData )
{
Event event( Event::PAN_EVENT );
{
DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" );
if( NULL != mImpl->mEventData )
{
Event event( Event::PAN_EVENT );
- event.p1.mInt = stat
e
;
+ event.p1.mInt = stat
ic_cast<int>( state )
;
event.p2.mFloat = displacement.x;
event.p3.mFloat = displacement.y;
mImpl->mEventData->mEventQueue.push_back( event );
event.p2.mFloat = displacement.x;
event.p3.mFloat = displacement.y;
mImpl->mEventData->mEventQueue.push_back( event );
@@
-3107,11
+3115,11
@@
void Controller::PanEvent( Gesture::State state, const Vector2& displacement )
}
}
}
}
-void Controller::LongPressEvent( Gesture
::
State state, float x, float y )
+void Controller::LongPressEvent( GestureState state, float x, float y )
{
DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected LongPressEvent" );
{
DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected LongPressEvent" );
- if( ( state == Gesture
::Started
) &&
+ if( ( state == Gesture
State::STARTED
) &&
( NULL != mImpl->mEventData ) )
{
// The 1st long-press on inactive text-field is treated as tap
( NULL != mImpl->mEventData ) )
{
// The 1st long-press on inactive text-field is treated as tap
@@
-3130,7
+3138,7
@@
void Controller::LongPressEvent( Gesture::State state, float x, float y )
else if( !mImpl->IsShowingRealText() )
{
Event event( Event::LONG_PRESS_EVENT );
else if( !mImpl->IsShowingRealText() )
{
Event event( Event::LONG_PRESS_EVENT );
- event.p1.mInt = stat
e
;
+ event.p1.mInt = stat
ic_cast<int>( state )
;
event.p2.mFloat = x;
event.p3.mFloat = y;
mImpl->mEventData->mEventQueue.push_back( event );
event.p2.mFloat = x;
event.p3.mFloat = y;
mImpl->mEventData->mEventQueue.push_back( event );
@@
-3142,7
+3150,7
@@
void Controller::LongPressEvent( Gesture::State state, float x, float y )
mImpl->ResetInputMethodContext();
Event event( Event::LONG_PRESS_EVENT );
mImpl->ResetInputMethodContext();
Event event( Event::LONG_PRESS_EVENT );
- event.p1.mInt = stat
e
;
+ event.p1.mInt = stat
ic_cast<int>( state )
;
event.p2.mFloat = x;
event.p3.mFloat = y;
mImpl->mEventData->mEventQueue.push_back( event );
event.p2.mFloat = x;
event.p3.mFloat = y;
mImpl->mEventData->mEventQueue.push_back( event );
@@
-4150,7
+4158,7
@@
void Controller::ProcessModifyEvents()
mImpl->mEventData->mRightSelectionPosition = mImpl->mEventData->mPrimaryCursorPosition;
}
mImpl->mEventData->mRightSelectionPosition = mImpl->mEventData->mPrimaryCursorPosition;
}
- // D
iscard
temporary text
+ // D
ISCARD
temporary text
events.Clear();
}
events.Clear();
}