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 "theme change needs to be synchronous so that application can create controls...
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
styling
/
style-manager-impl.h
diff --git
a/base/dali-toolkit/internal/styling/style-manager-impl.h
b/base/dali-toolkit/internal/styling/style-manager-impl.h
index
d8d97b4
..
6e10e04
100644
(file)
--- a/
base/dali-toolkit/internal/styling/style-manager-impl.h
+++ b/
base/dali-toolkit/internal/styling/style-manager-impl.h
@@
-245,8
+245,6
@@
private:
BuilderMap mBuilderCache; ///< Cache of builders keyed by JSON file name
BuilderMap mBuilderCache; ///< Cache of builders keyed by JSON file name
- bool mSetThemeConnection; ///< Has the callback to set the theme been set
-
// Signals
Toolkit::StyleManager::StyleChangeSignalType mStyleChangeSignal; ///< Emitted when the style( theme/font ) changes
};
// Signals
Toolkit::StyleManager::StyleChangeSignalType mStyleChangeSignal; ///< Emitted when the style( theme/font ) changes
};