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
Changed all property & signal names to lowerCamelCase
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
styling
/
style-manager-impl.cpp
diff --git
a/dali-toolkit/internal/styling/style-manager-impl.cpp
b/dali-toolkit/internal/styling/style-manager-impl.cpp
index
c245c15
..
2861611
100644
(file)
--- a/
dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/
dali-toolkit/internal/styling/style-manager-impl.cpp
@@
-34,7
+34,7
@@
namespace
const char* LANDSCAPE_QUALIFIER = "landscape";
const char* PORTRAIT_QUALIFIER = "portrait";
const char* LANDSCAPE_QUALIFIER = "landscape";
const char* PORTRAIT_QUALIFIER = "portrait";
-const char* FONT_SIZE_QUALIFIER = "
font-size-
";
+const char* FONT_SIZE_QUALIFIER = "
FontSize
";
const char* DEFAULT_THEME = DALI_STYLE_DIR "dali-toolkit-default-theme.json";
const char* DEFAULT_THEME = DALI_STYLE_DIR "dali-toolkit-default-theme.json";
@@
-100,6
+100,7
@@
Toolkit::StyleManager StyleManager::Get()
StyleManager::StyleManager()
: mOrientationDegrees( 0 ), // Portrait
mDefaultFontSize( -1 ),
StyleManager::StyleManager()
: mOrientationDegrees( 0 ), // Portrait
mDefaultFontSize( -1 ),
+ mDefaultFontFamily(""),
mThemeFile( DEFAULT_THEME ),
mFeedbackStyle( NULL )
{
mThemeFile( DEFAULT_THEME ),
mFeedbackStyle( NULL )
{
@@
-155,6
+156,11
@@
void StyleManager::SetOrientation( Orientation orientation )
}
}
}
}
+std::string StyleManager::GetDefaultFontFamily() const
+{
+ return mDefaultFontFamily;
+}
+
Orientation StyleManager::GetOrientation()
{
return mOrientation;
Orientation StyleManager::GetOrientation()
{
return mOrientation;
@@
-283,7
+289,7
@@
void StyleManager::ApplyStyle( Toolkit::Builder builder, Toolkit::Control contro
{
// Apply the style for logical font size
std::stringstream fontSizeQualifier;
{
// Apply the style for logical font size
std::stringstream fontSizeQualifier;
- fontSizeQualifier << styleName <<
"-" <<
FONT_SIZE_QUALIFIER << mDefaultFontSize;
+ fontSizeQualifier << styleName << FONT_SIZE_QUALIFIER << mDefaultFontSize;
builder.ApplyStyle( fontSizeQualifier.str(), control );
}
}
builder.ApplyStyle( fontSizeQualifier.str(), control );
}
}
@@
-303,10
+309,7
@@
void StyleManager::ApplyThemeStyle( Toolkit::Control control )
void StyleManager::ApplyThemeStyleAtInit( Toolkit::Control control )
{
void StyleManager::ApplyThemeStyleAtInit( Toolkit::Control control )
{
- if( mThemeBuilder )
- {
- ApplyStyle( mThemeBuilder, control );
- }
+ ApplyThemeStyle( control );
if(mFeedbackStyle)
{
if(mFeedbackStyle)
{
@@
-420,6
+423,7
@@
void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange::T
{
case StyleChange::DEFAULT_FONT_CHANGE:
{
{
case StyleChange::DEFAULT_FONT_CHANGE:
{
+ mDefaultFontFamily = styleMonitor.GetDefaultFontFamily();
break;
}
break;
}