forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #172 from g4z3r/master 

optimization: caching widget style
This commit is contained in:
Vadim Lopatin 2016-02-01 06:39:01 +03:00
parent b1c81cc824 744383d0fd
commit 1e902a00bb
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/dlangui/widgets/widget.d
View File

@ -181,9 +181,6 @@ public:
return CursorType.Arrow; return CursorType.Arrow;
} }
debug {
private static __gshared int _instanceCount = 0;
}
/// empty parameter list constructor - for usage by factory /// empty parameter list constructor - for usage by factory
this() { this() {
this(null); this(null);
@ -192,10 +189,17 @@ public:
this(string ID) { this(string ID) {
_id = ID; _id = ID;
_state = State.Enabled; _state = State.Enabled;
_cachedStyle = currentTheme.get(null);
debug _instanceCount++; debug _instanceCount++;
//Log.d("Created widget, count = ", ++_instanceCount); //Log.d("Created widget, count = ", ++_instanceCount);
} }
debug {
private static __gshared int _instanceCount = 0;
/// for debug purposes - number of created widget objects, not yet destroyed
static @property int instanceCount() { return _instanceCount; }
}
~this() { ~this() {
debug { debug {
//Log.v("destroying widget ", _id, " ", this.classinfo.name); //Log.v("destroying widget ", _id, " ", this.classinfo.name);
@ -209,15 +213,15 @@ public:
//Log.d("Destroyed widget, count = ", --_instanceCount); //Log.d("Destroyed widget, count = ", --_instanceCount);
} }
debug {
/// for debug purposes - number of created widget objects, not yet destroyed
static @property int instanceCount() { return _instanceCount; }
}
// Caching a style to decrease a number of currentTheme.get calls.
private Style _cachedStyle;
/// accessor to style - by lookup in theme by styleId (if style id is not set, theme base style will be used). /// accessor to style - by lookup in theme by styleId (if style id is not set, theme base style will be used).
protected @property const (Style) style() const { protected @property const (Style) style() const {
if (_ownStyle !is null) if (_ownStyle !is null)
return _ownStyle; return _ownStyle;
if(_cachedStyle !is null)
return _cachedStyle;
return currentTheme.get(_styleId); return currentTheme.get(_styleId);
} }
/// accessor to style - by lookup in theme by styleId (if style id is not set, theme base style will be used). /// accessor to style - by lookup in theme by styleId (if style id is not set, theme base style will be used).
@ -251,6 +255,7 @@ public:
/// handle theme change: e.g. reload some themed resources /// handle theme change: e.g. reload some themed resources
void onThemeChanged() { void onThemeChanged() {
_cachedStyle = currentTheme.get(_styleId);
// default implementation: call recursive for children // default implementation: call recursive for children
for (int i = 0; i < childCount; i++) for (int i = 0; i < childCount; i++)
child(i).onThemeChanged(); child(i).onThemeChanged();
@ -323,6 +328,7 @@ public:
_styleId = id; _styleId = id;
if (_ownStyle) if (_ownStyle)
_ownStyle.parentStyleId = id; _ownStyle.parentStyleId = id;
_cachedStyle = currentTheme.get(id);
return this; return this;
} }
/// get margins (between widget bounds and its background) /// get margins (between widget bounds and its background)