Add getter/setter for ignoreGlobalFontSizeChanged.
And make watch-application always set this option to true.
Change-Id: Iade9f6037c6230c2cdf8108f7896a7a6a7c60309
Signed-off-by: minho.sun <minho.sun@samsung.com>
}
StyleMonitor::StyleMonitor()
-: mDefaultFontSize(-1)
+: mDefaultFontSize(-1),
+ mIgnoreGlobalFontSizeChange(-1)
{
mFontClient = TextAbstraction::FontClient::Get();
GetSystemDefaultFontFamily( mFontClient, mDefaultFontFamily );
return retval;
}
-Dali::StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
-{
- return mStyleChangeSignal;
-}
-
void StyleMonitor::EmitStyleChangeSignal( StyleChange::Type styleChange )
{
if( !mStyleChangeSignal.Empty() )
}
}
+int StyleMonitor::GetIgnoreGlobalFontSizeChange()
+{
+ return mIgnoreGlobalFontSizeChange;
+}
+
+void StyleMonitor::SetIgnoreGlobalFontSizeChange(int value)
+{
+ mIgnoreGlobalFontSizeChange = value;
+}
+
+Dali::StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
+{
+ return mStyleChangeSignal;
+}
+
} // namespace Adaptor
} // namespace Internal
*/
bool LoadThemeFile( const std::string& filename, std::string& output );
+ /**
+ * @copydoc Dali::StyleMonitor::GetIgnoreGlobalFontSizeChange()
+ */
+ int GetIgnoreGlobalFontSizeChange();
+
+ /**
+ * @copydoc Dali::StyleMonitor::SetIgnoreGlobalFontSizeChange()
+ */
+ void SetIgnoreGlobalFontSizeChange(int value);
+
// Signals
/**
std::string mDefaultFontStyle; ///< The default font style
std::string mUserDefinedThemeFilePath; ///< String containing the user defined theme file path
int mDefaultFontSize; ///< The default accessibility font size e.g. 0 is smallest
+ int mIgnoreGlobalFontSizeChange; ///< Ignore global font size change when it is 1
};
} // namespace Adaptor
return GetImplementation(*this).LoadThemeFile( filename, output );
}
+int StyleMonitor::GetIgnoreGlobalFontSizeChange()
+{
+ return GetImplementation(*this).GetIgnoreGlobalFontSizeChange();
+}
+
+void StyleMonitor::SetIgnoreGlobalFontSizeChange(int value)
+{
+ GetImplementation(*this).SetIgnoreGlobalFontSizeChange( value );
+}
+
StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
{
return GetImplementation(*this).StyleChangeSignal();
*/
bool LoadThemeFile( const std::string& filename, std::string& output );
+ /**
+ * Return the value of mIgnoreGlobalFontSizeChange.
+ * @return Return mIgnoreGlobalFontSizeChange.
+ */
+ int GetIgnoreGlobalFontSizeChange();
+
+ /**
+ * Informs the Style Monitor that the style has changed.
+ * @param[in] value The value of mIgnoreGlobalFontSizeChange.
+ */
+ void SetIgnoreGlobalFontSizeChange(int value);
+
public: // Signals
/**
// CLASS HEADER
#include "watch-application-impl.h"
+#include <style-monitor.h>
namespace Dali
{
: Application(argc, argv, stylesheet, windowMode, PositionSize(), Framework::WATCH),
mState( UNINITIALIZED )
{
+ Dali::StyleMonitor::Get().SetIgnoreGlobalFontSizeChange(1);
}
WatchApplication::~WatchApplication()