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

fix styles access

This commit is contained in:
Vadim Lopatin 2014-03-07 11:04:50 +04:00
parent 6623e6bffe
commit aef01a1044
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/dlangui/widgets/styles.d
View File

@ -67,7 +67,7 @@ class Style {
return _parentStyle; return _parentStyle;
if (_parentId !is null && currentTheme !is null) if (_parentId !is null && currentTheme !is null)
return currentTheme.get(_parentId); return currentTheme.get(_parentId);
return null; return currentTheme;
} }
@property Style parentStyle() { @property Style parentStyle() {
@ -75,7 +75,7 @@ class Style {
return _parentStyle; return _parentStyle;
if (_parentId !is null && currentTheme !is null) if (_parentId !is null && currentTheme !is null)
return currentTheme.get(_parentId); return currentTheme.get(_parentId);
return null; return currentTheme;
} }
@property ref FontRef font() const { @property ref FontRef font() const {
@ -92,7 +92,7 @@ class Style {
/// font size /// font size
@property FontFamily fontFamily() const { @property FontFamily fontFamily() const {
if (_fontFamily != FontFamily.Unspecified || _parentStyle is null) if (_fontFamily != FontFamily.Unspecified)
return _fontFamily; return _fontFamily;
else else
return parentStyle.fontFamily; return parentStyle.fontFamily;
@ -100,7 +100,7 @@ class Style {
/// font size /// font size
@property string fontFace() const { @property string fontFace() const {
if (_fontFace !is null || _parentStyle is null) if (_fontFace !is null)
return _fontFace; return _fontFace;
else else
return parentStyle.fontFace; return parentStyle.fontFace;
@ -108,7 +108,7 @@ class Style {
/// font style - italic /// font style - italic
@property bool fontItalic() const { @property bool fontItalic() const {
if (_fontStyle != FONT_STYLE_UNSPECIFIED || _parentStyle is null) if (_fontStyle != FONT_STYLE_UNSPECIFIED)
return _fontStyle == FONT_STYLE_ITALIC; return _fontStyle == FONT_STYLE_ITALIC;
else else
return parentStyle.fontItalic; return parentStyle.fontItalic;
@ -116,7 +116,7 @@ class Style {
/// font weight /// font weight
@property ushort fontWeight() const { @property ushort fontWeight() const {
if (_fontWeight != FONT_WEIGHT_UNSPECIFIED || _parentStyle is null) if (_fontWeight != FONT_WEIGHT_UNSPECIFIED)
return _fontWeight; return _fontWeight;
else else
return parentStyle.fontWeight; return parentStyle.fontWeight;
@ -124,7 +124,7 @@ class Style {
/// font size /// font size
@property ushort fontSize() const { @property ushort fontSize() const {
if (_fontSize != FONT_SIZE_UNSPECIFIED || _parentStyle is null) if (_fontSize != FONT_SIZE_UNSPECIFIED)
return _fontSize; return _fontSize;
else else
return parentStyle.fontSize; return parentStyle.fontSize;
@ -146,7 +146,7 @@ class Style {
/// text color /// text color
@property uint textColor() const { @property uint textColor() const {
if (_textColor != COLOR_UNSPECIFIED || _parentStyle is null) if (_textColor != COLOR_UNSPECIFIED)
return _textColor; return _textColor;
else else
return parentStyle.textColor; return parentStyle.textColor;
@ -154,7 +154,7 @@ class Style {
/// background color /// background color
@property uint backgroundColor() const { @property uint backgroundColor() const {
if (_backgroundColor != COLOR_UNSPECIFIED || _parentStyle is null) if (_backgroundColor != COLOR_UNSPECIFIED)
return _backgroundColor; return _backgroundColor;
else else
return parentStyle.backgroundColor; return parentStyle.backgroundColor;
@ -162,7 +162,7 @@ class Style {
/// get full alignment (both vertical and horizontal) /// get full alignment (both vertical and horizontal)
@property ubyte alignment() const { @property ubyte alignment() const {
if (_align != Align.Unspecified || _parentStyle is null) if (_align != Align.Unspecified)
return _align; return _align;
else else
return parentStyle.alignment; return parentStyle.alignment;
@ -280,6 +280,7 @@ class Theme : Style {
_fontStyle = FONT_STYLE_NORMAL; _fontStyle = FONT_STYLE_NORMAL;
_fontWeight = 400; _fontWeight = 400;
_fontFace = "Arial"; // TODO: from settings _fontFace = "Arial"; // TODO: from settings
_fontFamily = FontFamily.SansSerif;
} }
/// create wrapper style which will have currentTheme.get(id) as parent instead of fixed parent - to modify some base style properties in widget /// create wrapper style which will have currentTheme.get(id) as parent instead of fixed parent - to modify some base style properties in widget