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
Merge "Removed 3D layer dependency of Model3dView and Mesh Visual." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-impl.h
diff --git
a/dali-toolkit/internal/text/text-controller-impl.h
b/dali-toolkit/internal/text/text-controller-impl.h
index
b220be6
..
9b17fa7
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.h
+++ b/
dali-toolkit/internal/text/text-controller-impl.h
@@
-116,6
+116,8
@@
struct EventData
*/
std::vector<Event> mEventQueue; ///< The queue of touch events etc.
*/
std::vector<Event> mEventQueue; ///< The queue of touch events etc.
+ Vector<InputStyle::Mask> mInputStyleChangedQueue; ///< Queue of changes in the input style. Used to emit the signal in the iddle callback.
+
InputStyle mInputStyle; ///< The style to be set to the new inputed text.
State mPreviousState; ///< Stores the current state before it's updated with the new one.
InputStyle mInputStyle; ///< The style to be set to the new inputed text.
State mPreviousState; ///< Stores the current state before it's updated with the new one.
@@
-439,6
+441,11
@@
struct Controller::Impl
void NotifyImfManager();
/**
void NotifyImfManager();
/**
+ * @brief Helper to notify IMF manager with multi line status.
+ */
+ void NotifyImfMultiLineStatus();
+
+ /**
* @brief Retrieve the current cursor position.
*
* @return The cursor position.
* @brief Retrieve the current cursor position.
*
* @return The cursor position.
@@
-470,6
+477,12
@@
struct Controller::Impl
return !result; // If NumberOfItems greater than 0, return false
}
return !result; // If NumberOfItems greater than 0, return false
}
+ bool IsClipboardVisible()
+ {
+ bool result( mClipboard && mClipboard.IsVisible() );
+ return result;
+ }
+
/**
* @brief Calculates the start character index of the first paragraph to be updated and
* the end character index of the last paragraph to be updated.
/**
* @brief Calculates the start character index of the first paragraph to be updated and
* the end character index of the last paragraph to be updated.
@@
-577,7
+590,7
@@
struct Controller::Impl
void SendSelectionToClipboard( bool deleteAfterSending );
void SendSelectionToClipboard( bool deleteAfterSending );
- void
GetTextFromClipboard( unsigned int itemIndex, std::string& retrievedString
);
+ void
RequestGetTextFromClipboard(
);
void RepositionSelectionHandles();
void RepositionSelectionHandles( float visualX, float visualY );
void RepositionSelectionHandles();
void RepositionSelectionHandles( float visualX, float visualY );