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

draw box shadows as nine-patch; fix style's child states

This commit is contained in:
dayllenger 2017-10-16 12:16:15 +03:00
parent 18d30eb8a6
commit 2b74271c31
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/dlangui/graphics/resources.d
View File

@ -422,10 +422,10 @@ class BoxShadowDrawable : Drawable {
_blurSize = blurSize; _blurSize = blurSize;
_color = color; _color = color;
// now create a texture which will contain the shadow // now create a texture which will contain the shadow
uint size = 2 * blurSize + 3; uint size = 4 * blurSize + 1;
texture = new ColorDrawBuf(size, size); // TODO: get from/put to cache texture = new ColorDrawBuf(size, size); // TODO: get from/put to cache
// clear // clear
texture.fill(0xFFFFFFFF); texture.fill(color | 0xFF000000);
// draw a square in center of the texture // draw a square in center of the texture
texture.fillRect(Rect(blurSize, blurSize, size - blurSize, size - blurSize), color); texture.fillRect(Rect(blurSize, blurSize, size - blurSize, size - blurSize), color);
// blur the square // blur the square
@ -433,14 +433,39 @@ class BoxShadowDrawable : Drawable {
} }
override void drawTo(DrawBuf buf, Rect rc, uint state = 0, int tilex0 = 0, int tiley0 = 0) { override void drawTo(DrawBuf buf, Rect rc, uint state = 0, int tilex0 = 0, int tiley0 = 0) {
// this is a size of blurred part
uint b = _blurSize + _blurSize / 2 + 1;
// move and expand the shadow // move and expand the shadow
rc.left += _offsetX - _blurSize; rc.left += _offsetX - b;
rc.right += _offsetX + _blurSize; rc.top += _offsetY - b;
rc.top += _offsetY - _blurSize; rc.right += _offsetX + b;
rc.bottom += _offsetY + _blurSize; rc.bottom += _offsetY + b;
// apply new clipping to DrawBuf to draw outside of the widget
// apply new clipping to the DrawBuf to draw outside of the widget
auto saver = ClipRectSaver(buf, rc, 0, false); auto saver = ClipRectSaver(buf, rc, 0, false);
buf.drawRescaled(rc, texture, Rect(0, 0, texture.width, texture.height)); // TODO: nine-patch
if (_blurSize > 0) {
// Manual nine-patch
uint w = texture.width;
uint h = texture.height;
buf.drawFragment(rc.left, rc.top, texture, Rect(0, 0, b, b)); // top left
buf.drawRescaled(Rect(rc.left + b, rc.top, rc.right - b, rc.top + b), texture, Rect(b, 0, w - b, b)); // top center
buf.drawFragment(rc.right - b, rc.top, texture, Rect(w - b, 0, w, b)); // top right
buf.drawRescaled(Rect(rc.left, rc.top + b, rc.left + b, rc.bottom - b), texture, Rect(0, b, b, h - b)); // middle left
buf.drawRescaled(Rect(rc.left + b, rc.top + b, rc.right - b, rc.bottom - b), texture, Rect(b, b, w - b, h - b)); // middle center
buf.drawRescaled(Rect(rc.right - b, rc.top + b, rc.right, rc.bottom - b), texture, Rect(w - b, b, w, h - b)); // middle right
buf.drawFragment(rc.left, rc.bottom - b, texture, Rect(0, h - b, b, h)); // bottom left
buf.drawRescaled(Rect(rc.left + b, rc.bottom - b, rc.right - b, rc.bottom), texture, Rect(b, h - b, w - b, h)); // bottom center
buf.drawFragment(rc.right - b, rc.bottom - b, texture, Rect(w - b, h - b, w, h)); // bottom right
// debug
//~ buf.drawFragment(rc.left, rc.top, texture, Rect(0, 0, w, h));
} else {
buf.fillRect(rc, _color);
}
} }
@property override int width() { return 1; } @property override int width() { return 1; }

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

@ -926,6 +926,7 @@ public:
res._alpha = _alpha; res._alpha = _alpha;
res._fontFace = _fontFace; res._fontFace = _fontFace;
res._backgroundImageId = _backgroundImageId; res._backgroundImageId = _backgroundImageId;
res._boxShadow = _boxShadow;
res._border = _border; res._border = _border;
res._padding = _padding; res._padding = _padding;
res._margins = _margins; res._margins = _margins;