From: Victor Cebollada Date: Wed, 8 Apr 2015 13:19:21 +0000 (+0100) Subject: Move FontDefaults Declaration/Definition as it's needed by the TextInput. X-Git-Tag: dali_1.0.38~11^2~6^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=e3eaed5c8d335c82c5cbd983cb3a6ea6abe0fb53 Move FontDefaults Declaration/Definition as it's needed by the TextInput. Change-Id: I61e79c35bf4eb6acf60ac641628719fbd20d1aea Signed-off-by: Victor Cebollada --- diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 34f73b0..591dbaf 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -70,6 +70,31 @@ namespace Toolkit namespace Text { +struct Controller::FontDefaults +{ + FontDefaults() + : mDefaultPointSize(0.0f), + mFontId(0u) + { + } + + FontId GetFontId( TextAbstraction::FontClient& fontClient ) + { + if( !mFontId ) + { + Dali::TextAbstraction::PointSize26Dot6 pointSize = mDefaultPointSize*64; + mFontId = fontClient.GetFontId( mDefaultFontFamily, mDefaultFontStyle, pointSize ); + } + + return mFontId; + } + + std::string mDefaultFontFamily; + std::string mDefaultFontStyle; + float mDefaultPointSize; + FontId mFontId; +}; + struct Controller::TextInput { // Used to queue input events until DoRelayout() @@ -605,31 +630,6 @@ struct Controller::TextInput bool mUpdateCursorPosition : 1; ///< True if the visual position of the cursor must be recalculated }; -struct Controller::FontDefaults -{ - FontDefaults() - : mDefaultPointSize(0.0f), - mFontId(0u) - { - } - - FontId GetFontId( TextAbstraction::FontClient& fontClient ) - { - if( !mFontId ) - { - Dali::TextAbstraction::PointSize26Dot6 pointSize = mDefaultPointSize*64; - mFontId = fontClient.GetFontId( mDefaultFontFamily, mDefaultFontStyle, pointSize ); - } - - return mFontId; - } - - std::string mDefaultFontFamily; - std::string mDefaultFontStyle; - float mDefaultPointSize; - FontId mFontId; -}; - struct Controller::Impl { Impl( ControlInterface& controlInterface )