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 "Enable Property::LABEL visual of a button when CreateVisuals" 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
old mode 100644
(file)
new mode 100755
(executable)
index
52dad25
..
3e50faf
--- a/
dali-toolkit/internal/text/text-controller-impl.h
+++ b/
dali-toolkit/internal/text/text-controller-impl.h
@@
-97,7
+97,7
@@
struct EventData
TEXT_PANNING
};
TEXT_PANNING
};
- EventData( DecoratorPtr decorator );
+ EventData( DecoratorPtr decorator
, InputMethodContext& inputMethodContext
);
~EventData();
~EventData();
@@
-107,7
+107,7
@@
struct EventData
}
DecoratorPtr mDecorator; ///< Pointer to the decorator.
}
DecoratorPtr mDecorator; ///< Pointer to the decorator.
- I
mfManager mImfManager;
///< The Input Method Framework Manager.
+ I
nputMethodContext mInputMethodContext;
///< The Input Method Framework Manager.
FontDefaults* mPlaceholderFont; ///< The placeholder default font.
std::string mPlaceholderTextActive; ///< The text to display when the TextField is empty with key-input focus.
std::string mPlaceholderTextInactive; ///< The text to display when the TextField is empty and inactive.
FontDefaults* mPlaceholderFont; ///< The placeholder default font.
std::string mPlaceholderTextActive; ///< The text to display when the TextField is empty with key-input focus.
std::string mPlaceholderTextInactive; ///< The text to display when the TextField is empty and inactive.
@@
-329,7
+329,8
@@
struct Controller::Impl
mShadowSetByString( false ),
mOutlineSetByString( false ),
mFontStyleSetByString( false ),
mShadowSetByString( false ),
mOutlineSetByString( false ),
mFontStyleSetByString( false ),
- mShouldClearFocusOnEscape( true )
+ mShouldClearFocusOnEscape( true ),
+ mLayoutDirection( LayoutDirection::LEFT_TO_RIGHT )
{
mModel = Model::New();
{
mModel = Model::New();
@@
-455,14
+456,14
@@
struct Controller::Impl
}
}
}
}
- void ResetI
mfManager
()
+ void ResetI
nputMethodContext
()
{
if( mEventData )
{
// Reset incase we are in a pre-edit state.
{
if( mEventData )
{
// Reset incase we are in a pre-edit state.
- if( mEventData->mI
mfManager
)
+ if( mEventData->mI
nputMethodContext
)
{
{
- mEventData->mI
mfManager
.Reset(); // Will trigger a message ( commit, get surrounding )
+ mEventData->mI
nputMethodContext
.Reset(); // Will trigger a message ( commit, get surrounding )
}
ClearPreEditFlag();
}
ClearPreEditFlag();
@@
-470,14
+471,14
@@
struct Controller::Impl
}
/**
}
/**
- * @brief Helper to notify I
MF manager
with surrounding text & cursor changes.
+ * @brief Helper to notify I
nputMethodContext
with surrounding text & cursor changes.
*/
*/
- void NotifyI
mfManager
();
+ void NotifyI
nputMethodContext
();
/**
/**
- * @brief Helper to notify I
MF manager
with multi line status.
+ * @brief Helper to notify I
nputMethodContext
with multi line status.
*/
*/
- void NotifyI
mf
MultiLineStatus();
+ void NotifyI
nputMethodContext
MultiLineStatus();
/**
* @brief Retrieve the current cursor position.
/**
* @brief Retrieve the current cursor position.
@@
-765,6
+766,7
@@
public:
bool mOutlineSetByString:1; ///< Set when outline is set by string (legacy) instead of map
bool mFontStyleSetByString:1; ///< Set when font style is set by string (legacy) instead of map
bool mShouldClearFocusOnEscape:1; ///< Whether text control should clear key input focus
bool mOutlineSetByString:1; ///< Set when outline is set by string (legacy) instead of map
bool mFontStyleSetByString:1; ///< Set when font style is set by string (legacy) instead of map
bool mShouldClearFocusOnEscape:1; ///< Whether text control should clear key input focus
+ LayoutDirection::Type mLayoutDirection; ///< Current system language direction
};
} // namespace Text
};
} // namespace Text