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

Switch to undead xml

This commit is contained in:
Grim Maple 2022-10-08 21:27:24 +03:00
parent c9ccaad2ed
commit 91fbca984e
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dub.json
View File

@ -30,7 +30,8 @@
"excludedSourceFiles-windows": ["3rdparty/fontconfig/*"], "excludedSourceFiles-windows": ["3rdparty/fontconfig/*"],
"dependencies": { "dependencies": {
"inilike": "~>1.2.1" "inilike": "~>1.2.1",
"undead": "~>1.1.7"
}, },
"subPackages": [ "subPackages": [

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

@ -101,7 +101,7 @@ import dlangui.graphics.colors;
import dlangui.graphics.drawbuf; import dlangui.graphics.drawbuf;
import std.file; import std.file;
import std.algorithm; import std.algorithm;
import std.xml; import undead.xml;
import std.conv; import std.conv;
import std.string; import std.string;
import std.path; import std.path;
@ -1222,8 +1222,8 @@ class CombinedDrawable : Drawable {
this(uint backgroundColor, string backgroundImageId, string borderDescription, string boxShadowDescription) { this(uint backgroundColor, string backgroundImageId, string borderDescription, string boxShadowDescription) {
boxShadow = boxShadowDescription !is null ? drawableCache.get("#box-shadow," ~ boxShadowDescription) : new EmptyDrawable; boxShadow = boxShadowDescription !is null ? drawableCache.get("#box-shadow," ~ boxShadowDescription) : new EmptyDrawable;
background = background =
(backgroundImageId !is null) ? drawableCache.get(backgroundImageId) : (backgroundImageId !is null) ? drawableCache.get(backgroundImageId) :
(!backgroundColor.isFullyTransparentColor) ? new SolidFillDrawable(backgroundColor) : null; (!backgroundColor.isFullyTransparentColor) ? new SolidFillDrawable(backgroundColor) : null;
if (background is null) if (background is null)
background = new EmptyDrawable; background = new EmptyDrawable;
@ -1245,7 +1245,7 @@ class CombinedDrawable : Drawable {
@property override int width() { return background.width + border.padding.left + border.padding.right; } @property override int width() { return background.width + border.padding.left + border.padding.right; }
@property override int height() { return background.height + border.padding.top + border.padding.bottom; } @property override int height() { return background.height + border.padding.top + border.padding.bottom; }
@property override Rect padding() { @property override Rect padding() {
return Rect(background.padding.left + border.padding.left, background.padding.top + border.padding.top, return Rect(background.padding.left + border.padding.left, background.padding.top + border.padding.top,
background.padding.right + border.padding.right, background.padding.bottom + border.padding.bottom); background.padding.right + border.padding.right, background.padding.bottom + border.padding.bottom);
} }
} }

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

@ -25,9 +25,9 @@ module dlangui.widgets.styles;
import dlangui.core.config; import dlangui.core.config;
private import std.xml; import undead.xml;
private import std.string; import std.string;
private import std.algorithm; import std.algorithm;
import dlangui.core.types; import dlangui.core.types;
import dlangui.graphics.colors; import dlangui.graphics.colors;