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 "Fix the cursor position when retrieving the selected text." 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
e60fe37
..
8ada007
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.h
+++ b/
dali-toolkit/internal/text/text-controller-impl.h
@@
-21,7
+21,6
@@
// EXTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/clipboard.h>
#include <dali/devel-api/text-abstraction/font-client.h>
// EXTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/clipboard.h>
#include <dali/devel-api/text-abstraction/font-client.h>
-#include <iostream>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/layouts/layout-engine.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/layouts/layout-engine.h>
@@
-175,11
+174,14
@@
struct ModifyEvent
struct FontDefaults
{
FontDefaults()
struct FontDefaults
{
FontDefaults()
- : m
DefaultFontFamily(""
),
- m
DefaultFontStyle(""
),
+ : m
FontDescription(
),
+ m
FontStyle(
),
mDefaultPointSize(0.0f),
mFontId(0u)
{
mDefaultPointSize(0.0f),
mFontId(0u)
{
+ // Initially use the default platform font
+ TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+ fontClient.GetDefaultPlatformFontDescription( mFontDescription );
}
FontId GetFontId( TextAbstraction::FontClient& fontClient )
}
FontId GetFontId( TextAbstraction::FontClient& fontClient )
@@
-187,14
+189,14
@@
struct FontDefaults
if( !mFontId )
{
Dali::TextAbstraction::PointSize26Dot6 pointSize = mDefaultPointSize*64;
if( !mFontId )
{
Dali::TextAbstraction::PointSize26Dot6 pointSize = mDefaultPointSize*64;
- mFontId = fontClient.GetFontId( m
DefaultFontFamily, mDefaultFontStyle
, pointSize );
+ mFontId = fontClient.GetFontId( m
FontDescription
, pointSize );
}
return mFontId;
}
}
return mFontId;
}
-
std::string mDefaultFontFamily
;
- std::string m
Default
FontStyle;
+
TextAbstraction::FontDescription mFontDescription
;
+ std::string mFontStyle;
float mDefaultPointSize;
FontId mFontId;
};
float mDefaultPointSize;
FontId mFontId;
};
@@
-218,7
+220,7
@@
struct Controller::Impl
mOperationsPending( NO_OPERATION ),
mMaximumNumberOfCharacters( 50 ),
mRecalculateNaturalSize( true ),
mOperationsPending( NO_OPERATION ),
mMaximumNumberOfCharacters( 50 ),
mRecalculateNaturalSize( true ),
- mUserDefinedFontFamily( false)
+ mUserDefinedFontFamily( false
)
{
mLogicalModel = LogicalModel::New();
mVisualModel = VisualModel::New();
{
mLogicalModel = LogicalModel::New();
mVisualModel = VisualModel::New();
@@
-288,6
+290,14
@@
struct Controller::Impl
return ( mEventData && mEventData->mIsShowingPlaceholderText );
}
return ( mEventData && mEventData->mIsShowingPlaceholderText );
}
+ /**
+ * @brief Helper to check whether active place-holder text is available.
+ */
+ bool IsFocusedPlaceholderAvailable() const
+ {
+ return ( mEventData && !mEventData->mPlaceholderTextActive.empty() );
+ }
+
bool IsShowingRealText() const
{
return ( !IsShowingPlaceholderText() &&
bool IsShowingRealText() const
{
return ( !IsShowingPlaceholderText() &&
@@
-320,14
+330,17
@@
struct Controller::Impl
void ResetImfManager()
{
void ResetImfManager()
{
- // Reset incase we are in a pre-edit state.
- ImfManager imfManager = ImfManager::Get();
- if ( imfManager )
+ if( mEventData )
{
{
- imfManager.Reset(); // Will trigger a commit message
+ // Reset incase we are in a pre-edit state.
+ ImfManager imfManager = ImfManager::Get();
+ if ( imfManager )
+ {
+ imfManager.Reset(); // Will trigger a commit message
+ }
+
+ ClearPreEditFlag();
}
}
-
- ClearPreEditFlag();
}
bool IsClipboardEmpty()
}
bool IsClipboardEmpty()
@@
-488,7
+501,7
@@
struct Controller::Impl
Length mMaximumNumberOfCharacters; ///< Maximum number of characters that can be inserted.
bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated.
Length mMaximumNumberOfCharacters; ///< Maximum number of characters that can be inserted.
bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated.
- bool mUserDefinedFontFamily:1; ///< Whether the Font family was
Set by the user instead of being left as sytem default
+ bool mUserDefinedFontFamily:1; ///< Whether the Font family was
set by the user instead of being left as sytem default.
};
} // namespace Text
};
} // namespace Text