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

XCB version working - except libPNG version issue

This commit is contained in:
Vadim Lopatin 2014-03-14 17:39:56 +04:00
parent bf57f2f26f
commit a3d195fb8b
1 changed files with 424 additions and 419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,15 +84,18 @@ class Widget {
@property Rect padding() const { @property Rect padding() const {
// get max padding from style padding and background drawable padding // get max padding from style padding and background drawable padding
Rect p = style.padding; Rect p = style.padding;
Rect dp = style.backgroundDrawable.padding; DrawableRef d = style.backgroundDrawable;
if (p.left < dp.left) if (!d.isNull) {
p.left = dp.left; Rect dp = style.backgroundDrawable.padding;
if (p.right < dp.right) if (p.left < dp.left)
p.right = dp.right; p.left = dp.left;
if (p.top < dp.top) if (p.right < dp.right)
p.top = dp.top; p.right = dp.right;
if (p.bottom < dp.bottom) if (p.top < dp.top)
p.bottom = dp.bottom; p.top = dp.top;
if (p.bottom < dp.bottom)
p.bottom = dp.bottom;
}
return p; return p;
} }
/// set padding for widget - override one from style /// set padding for widget - override one from style
@ -259,8 +262,10 @@ class Widget {
Rect rc = _pos; Rect rc = _pos;
applyMargins(rc); applyMargins(rc);
DrawableRef bg = style.backgroundDrawable; DrawableRef bg = style.backgroundDrawable;
bg.drawTo(buf, rc); if (!bg.isNull) {
applyPadding(rc); bg.drawTo(buf, rc);
}
applyPadding(rc);
_needDraw = false; _needDraw = false;
} }