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 "TextField added to programming guide" into tizen
[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
bc249b3
..
814421e
100644
(file)
--- a/
dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/
dali-toolkit/internal/styling/style-manager-impl.cpp
@@
-18,9
+18,6
@@
#include "style-manager-impl.h"
// EXTERNAL INCLUDES
#include "style-manager-impl.h"
// EXTERNAL INCLUDES
-#include <fstream>
-#include <iostream>
-#include <sstream>
#include <dali/devel-api/adaptor-framework/singleton-service.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/devel-api/object/type-registry-helper.h>
#include <dali/devel-api/adaptor-framework/singleton-service.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/devel-api/object/type-registry-helper.h>
@@
-38,7
+35,7
@@
const char* LANDSCAPE_QUALIFIER = "landscape";
const char* PORTRAIT_QUALIFIER = "portrait";
const char* FONT_SIZE_QUALIFIER = "font-size-";
const char* PORTRAIT_QUALIFIER = "portrait";
const char* FONT_SIZE_QUALIFIER = "font-size-";
-const char* DEFAULT_THEME = DALI_STYLE_DIR "
tizen
-default-theme.json";
+const char* DEFAULT_THEME = DALI_STYLE_DIR "
dali-toolkit
-default-theme.json";
const char* PACKAGE_PATH_KEY = "PACKAGE_PATH";
const char* DEFAULT_PACKAGE_PATH = DALI_DATA_READ_ONLY_DIR "/toolkit/";
const char* PACKAGE_PATH_KEY = "PACKAGE_PATH";
const char* DEFAULT_PACKAGE_PATH = DALI_DATA_READ_ONLY_DIR "/toolkit/";
@@
-107,12
+104,12
@@
StyleManager::StyleManager()
// Add theme builder constants
mThemeBuilderConstants[ PACKAGE_PATH_KEY ] = DEFAULT_PACKAGE_PATH;
// Add theme builder constants
mThemeBuilderConstants[ PACKAGE_PATH_KEY ] = DEFAULT_PACKAGE_PATH;
-
StyleMonitor styleMonitor( StyleMonitor::Get()
);
- if(
s
tyleMonitor )
+
mStyleMonitor = StyleMonitor::Get(
);
+ if(
mS
tyleMonitor )
{
{
-
s
tyleMonitor.StyleChangeSignal().Connect( this, &StyleManager::StyleMonitorChange );
+
mS
tyleMonitor.StyleChangeSignal().Connect( this, &StyleManager::StyleMonitorChange );
- mDefaultFontSize =
s
tyleMonitor.GetDefaultFontSize();
+ mDefaultFontSize =
mS
tyleMonitor.GetDefaultFontSize();
}
}
}
}
@@
-328,17
+325,11
@@
bool StyleManager::LoadFile( const std::string& filename, std::string& stringOut
{
DALI_ASSERT_DEBUG( 0 != filename.length());
{
DALI_ASSERT_DEBUG( 0 != filename.length());
- std::ifstream in( filename.c_str(), std::ios::in );
- if( in )
+ // as toolkit is platform agnostic, it cannot load files from filesystem
+ // ask style monitor to load the style sheet
+ if( mStyleMonitor )
{
{
- std::stringstream buffer;
- buffer << in.rdbuf();
-
- stringOut = buffer.str();
-
- in.close();
-
- return true;
+ return mStyleMonitor.LoadThemeFile( filename, stringOut );
}
return false;
}
return false;
@@
-367,9
+358,7
@@
void StyleManager::SetTheme()
mThemeBuilder = CreateBuilder( mThemeBuilderConstants );
if ( LoadJSON( mThemeBuilder, mThemeFile ) )
{
mThemeBuilder = CreateBuilder( mThemeBuilderConstants );
if ( LoadJSON( mThemeBuilder, mThemeFile ) )
{
- StyleChange change;
- change.themeChange = true;
- mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), change );
+ mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), StyleChange::THEME_CHANGE );
}
else
{
}
else
{
@@
-393,25
+382,36
@@
void StyleManager::CacheBuilder( Toolkit::Builder builder, const std::string& ke
mBuilderCache[ key ] = builder;
}
mBuilderCache[ key ] = builder;
}
-void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange styleChange )
+void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange
::Type
styleChange )
{
{
- if( styleChange.defaultFontSizeChange )
- {
- mDefaultFontSize = styleMonitor.GetDefaultFontSize();
- }
-
- if( styleChange.themeChange )
+ switch ( styleChange )
{
{
- if( ! styleChange.themeFilePath.empty() )
+ case StyleChange::DEFAULT_FONT_CHANGE:
{
{
-
mThemeFile = styleChange.themeFilePath
;
+
break
;
}
}
- else
+
+ case StyleChange::DEFAULT_FONT_SIZE_CHANGE:
{
{
- mThemeFile = DEFAULT_THEME;
+ mDefaultFontSize = styleMonitor.GetDefaultFontSize();
+ break;
}
}
- SetTheme();
+ case StyleChange::THEME_CHANGE:
+ {
+ const std::string& newTheme = styleMonitor.GetTheme();
+ if( ! newTheme.empty() )
+ {
+ mThemeFile = newTheme;
+ }
+ else
+ {
+ mThemeFile = DEFAULT_THEME;
+ }
+
+ SetTheme();
+ break;
+ }
}
mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), styleChange );
}
mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), styleChange );