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 "Avoid overwriting TEXT with PLACEHOLDER_TEXT" 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
4378e84
..
69eee7b
100644
(file)
--- a/
dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/
dali-toolkit/internal/styling/style-manager-impl.cpp
@@
-18,18
+18,15
@@
#include "style-manager-impl.h"
// EXTERNAL INCLUDES
#include "style-manager-impl.h"
// EXTERNAL INCLUDES
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <dali/public-api/adaptor-framework/singleton-service.h>
+#include <dali/devel-api/adaptor-framework/singleton-service.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/type-registry.h>
-#include <dali/
public
-api/object/type-registry-helper.h>
+#include <dali/
devel
-api/object/type-registry-helper.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/
public
-api/styling/style-manager.h>
+#include <dali-toolkit/
devel
-api/styling/style-manager.h>
namespace
{
namespace
{
@@
-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/";
@@
-101,19
+98,18
@@
Toolkit::StyleManager StyleManager::Get()
StyleManager::StyleManager()
: mOrientationDegrees( 0 ), // Portrait
StyleManager::StyleManager()
: mOrientationDegrees( 0 ), // Portrait
- mDefaultFontSize( -1 )
+ mDefaultFontSize( -1 ),
+ mThemeFile( DEFAULT_THEME )
{
// Add theme builder constants
mThemeBuilderConstants[ PACKAGE_PATH_KEY ] = DEFAULT_PACKAGE_PATH;
{
// Add theme builder constants
mThemeBuilderConstants[ PACKAGE_PATH_KEY ] = DEFAULT_PACKAGE_PATH;
- RequestDefaultTheme();
-
- StyleMonitor styleMonitor( StyleMonitor::Get() );
- if( styleMonitor )
+ mStyleMonitor = StyleMonitor::Get();
+ if( mStyleMonitor )
{
{
-
s
tyleMonitor.StyleChangeSignal().Connect( this, &StyleManager::StyleMonitorChange );
+
mS
tyleMonitor.StyleChangeSignal().Connect( this, &StyleManager::StyleMonitorChange );
- mDefaultFontSize =
s
tyleMonitor.GetDefaultFontSize();
+ mDefaultFontSize =
mS
tyleMonitor.GetDefaultFontSize();
}
}
}
}
@@
-329,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;
@@
-401,6
+391,20
@@
void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange st
mDefaultFontSize = styleMonitor.GetDefaultFontSize();
}
mDefaultFontSize = styleMonitor.GetDefaultFontSize();
}
+ if( styleChange.themeChange )
+ {
+ if( ! styleChange.themeFilePath.empty() )
+ {
+ mThemeFile = styleChange.themeFilePath;
+ }
+ else
+ {
+ mThemeFile = DEFAULT_THEME;
+ }
+
+ SetTheme();
+ }
+
mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), styleChange );
}
mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), styleChange );
}