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
Text Fit
[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
898e2c6
..
5527870
--- a/
dali-toolkit/internal/text/text-controller-impl.h
+++ b/
dali-toolkit/internal/text/text-controller-impl.h
@@
-39,6
+39,10
@@
namespace Toolkit
namespace Text
{
namespace Text
{
+const float DEFAULT_TEXTFIT_MIN = 10.f;
+const float DEFAULT_TEXTFIT_MAX = 100.f;
+const float DEFAULT_TEXTFIT_STEP = 1.f;
+
//Forward declarations
struct CursorInfo;
struct FontDefaults;
//Forward declarations
struct CursorInfo;
struct FontDefaults;
@@
-64,6
+68,7
@@
struct Event
int mInt;
unsigned int mUint;
float mFloat;
int mInt;
unsigned int mUint;
float mFloat;
+ bool mBool;
};
Event( Type eventType )
};
Event( Type eventType )
@@
-96,7
+101,7
@@
struct EventData
TEXT_PANNING
};
TEXT_PANNING
};
- EventData( DecoratorPtr decorator );
+ EventData( DecoratorPtr decorator
, InputMethodContext& inputMethodContext
);
~EventData();
~EventData();
@@
-106,7
+111,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.
@@
-159,6
+164,9
@@
struct EventData
bool mPasswordInput : 1; ///< True if password input is enabled.
bool mCheckScrollAmount : 1; ///< Whether to check scrolled amount after updating the position
bool mIsPlaceholderPixelSize : 1; ///< True if the placeholder font size is set as pixel size.
bool mPasswordInput : 1; ///< True if password input is enabled.
bool mCheckScrollAmount : 1; ///< Whether to check scrolled amount after updating the position
bool mIsPlaceholderPixelSize : 1; ///< True if the placeholder font size is set as pixel size.
+ bool mIsPlaceholderElideEnabled : 1; ///< True if the placeholder text's elide is enabled.
+ bool mPlaceholderEllipsisFlag : 1; ///< True if the text controller sets the placeholder ellipsis.
+ bool mShiftSelectionFlag : 1; ///< True if the text selection using Shift key is enabled.
};
struct ModifyEvent
};
struct ModifyEvent
@@
-178,6
+186,7
@@
struct FontDefaults
FontDefaults()
: mFontDescription(),
mDefaultPointSize( 0.f ),
FontDefaults()
: mFontDescription(),
mDefaultPointSize( 0.f ),
+ mFitPointSize( 0.f ),
mFontId( 0u ),
familyDefined( false ),
weightDefined( false ),
mFontId( 0u ),
familyDefined( false ),
weightDefined( false ),
@@
-203,6
+212,7
@@
struct FontDefaults
TextAbstraction::FontDescription mFontDescription; ///< The default font's description.
float mDefaultPointSize; ///< The default font's point size.
TextAbstraction::FontDescription mFontDescription; ///< The default font's description.
float mDefaultPointSize; ///< The default font's point size.
+ float mFitPointSize; ///< The fit font's point size.
FontId mFontId; ///< The font's id of the default font.
bool familyDefined:1; ///< Whether the default font's family name is defined.
bool weightDefined:1; ///< Whether the default font's weight is defined.
FontId mFontId; ///< The font's id of the default font.
bool familyDefined:1; ///< Whether the default font's family name is defined.
bool weightDefined:1; ///< Whether the default font's weight is defined.
@@
-319,11
+329,18
@@
struct Controller::Impl
mMarkupProcessorEnabled( false ),
mClipboardHideEnabled( true ),
mIsAutoScrollEnabled( false ),
mMarkupProcessorEnabled( false ),
mClipboardHideEnabled( true ),
mIsAutoScrollEnabled( false ),
- mAutoScrollDirectionRTL( false ),
+ mUpdateTextDirection( true ),
+ mIsTextDirectionRTL( false ),
mUnderlineSetByString( false ),
mShadowSetByString( false ),
mUnderlineSetByString( false ),
mShadowSetByString( false ),
+ mOutlineSetByString( false ),
mFontStyleSetByString( false ),
mFontStyleSetByString( false ),
- mShouldClearFocusOnEscape( true )
+ mShouldClearFocusOnEscape( true ),
+ mLayoutDirection( LayoutDirection::LEFT_TO_RIGHT ),
+ mTextFitMinSize( DEFAULT_TEXTFIT_MIN ),
+ mTextFitMaxSize( DEFAULT_TEXTFIT_MAX ),
+ mTextFitStepSize( DEFAULT_TEXTFIT_STEP ),
+ mTextFitEnabled( false )
{
mModel = Model::New();
{
mModel = Model::New();
@@
-449,14
+466,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();
@@
-464,14
+481,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.
@@
-706,6
+723,18
@@
struct Controller::Impl
*/
void ScrollTextToMatchCursor( const CursorInfo& cursorInfo );
*/
void ScrollTextToMatchCursor( const CursorInfo& cursorInfo );
+public:
+
+ /**
+ * @brief Gets implementation from the controller handle.
+ * @param controller The text controller
+ * @return The implementation of the Controller
+ */
+ static Impl& GetImplementation( Text::Controller& controller )
+ {
+ return *controller.mImpl;
+ }
+
private:
// Declared private and left undefined to avoid copies.
Impl( const Impl& );
private:
// Declared private and left undefined to avoid copies.
Impl( const Impl& );
@@
-734,17
+763,26
@@
public:
OperationsMask mOperationsPending; ///< Operations pending to be done to layout the text.
Length mMaximumNumberOfCharacters; ///< Maximum number of characters that can be inserted.
HiddenText* mHiddenInput; ///< Avoid allocating this when the user does not specify hidden input mode.
OperationsMask mOperationsPending; ///< Operations pending to be done to layout the text.
Length mMaximumNumberOfCharacters; ///< Maximum number of characters that can be inserted.
HiddenText* mHiddenInput; ///< Avoid allocating this when the user does not specify hidden input mode.
+ Vector2 mTextFitContentSize; ///< Size of Text fit content
bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated.
bool mMarkupProcessorEnabled:1; ///< Whether the mark-up procesor is enabled.
bool mClipboardHideEnabled:1; ///< Whether the ClipboardHide function work or not
bool mIsAutoScrollEnabled:1; ///< Whether auto text scrolling is enabled.
bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated.
bool mMarkupProcessorEnabled:1; ///< Whether the mark-up procesor is enabled.
bool mClipboardHideEnabled:1; ///< Whether the ClipboardHide function work or not
bool mIsAutoScrollEnabled:1; ///< Whether auto text scrolling is enabled.
- CharacterDirection mAutoScrollDirectionRTL:1; ///< Direction of auto scrolling, true if rtl
+ bool mUpdateTextDirection:1; ///< Whether the text direction needs to be updated.
+ CharacterDirection mIsTextDirectionRTL:1; ///< Whether the text direction is right to left or not
bool mUnderlineSetByString:1; ///< Set when underline is set by string (legacy) instead of map
bool mShadowSetByString:1; ///< Set when shadow is set by string (legacy) instead of map
bool mUnderlineSetByString:1; ///< Set when underline is set by string (legacy) instead of map
bool mShadowSetByString:1; ///< Set when shadow is set by string (legacy) instead of map
+ 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 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
+
+ float mTextFitMinSize; ///< Minimum Font Size for text fit. Default 10
+ float mTextFitMaxSize; ///< Maximum Font Size for text fit. Default 100
+ float mTextFitStepSize; ///< Step Size for font intervalse. Default 1
+ bool mTextFitEnabled : 1; ///< Whether the text's fit is enabled.
};
} // namespace Text
};
} // namespace Text