@wcardinal/wcardinal-ui 0.161.0 → 0.162.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (30) hide show
  1. package/dist/types/wcardinal/ui/d-image-piece-layouter-part-bottom.d.ts +1 -1
  2. package/dist/types/wcardinal/ui/d-image-piece-layouter-part-left.d.ts +1 -1
  3. package/dist/types/wcardinal/ui/d-image-piece-layouter-part-right.d.ts +1 -1
  4. package/dist/types/wcardinal/ui/d-image-piece-layouter-part-top.d.ts +1 -1
  5. package/dist/types/wcardinal/ui/d-image-piece-layouter-part.d.ts +7 -2
  6. package/dist/wcardinal/ui/d-image-piece-layouter-part-bottom.js +3 -3
  7. package/dist/wcardinal/ui/d-image-piece-layouter-part-bottom.js.map +1 -1
  8. package/dist/wcardinal/ui/d-image-piece-layouter-part-center.js +3 -3
  9. package/dist/wcardinal/ui/d-image-piece-layouter-part-center.js.map +1 -1
  10. package/dist/wcardinal/ui/d-image-piece-layouter-part-container.js +49 -23
  11. package/dist/wcardinal/ui/d-image-piece-layouter-part-container.js.map +1 -1
  12. package/dist/wcardinal/ui/d-image-piece-layouter-part-left.js +3 -3
  13. package/dist/wcardinal/ui/d-image-piece-layouter-part-left.js.map +1 -1
  14. package/dist/wcardinal/ui/d-image-piece-layouter-part-middle.js +3 -3
  15. package/dist/wcardinal/ui/d-image-piece-layouter-part-middle.js.map +1 -1
  16. package/dist/wcardinal/ui/d-image-piece-layouter-part-right.js +3 -3
  17. package/dist/wcardinal/ui/d-image-piece-layouter-part-right.js.map +1 -1
  18. package/dist/wcardinal/ui/d-image-piece-layouter-part-top.js +3 -3
  19. package/dist/wcardinal/ui/d-image-piece-layouter-part-top.js.map +1 -1
  20. package/dist/wcardinal/ui/d-image-piece-layouter-part.js +20 -6
  21. package/dist/wcardinal/ui/d-image-piece-layouter-part.js.map +1 -1
  22. package/dist/wcardinal-ui-theme-dark.js +1 -1
  23. package/dist/wcardinal-ui-theme-dark.min.js +1 -1
  24. package/dist/wcardinal-ui-theme-white.js +1 -1
  25. package/dist/wcardinal-ui-theme-white.min.js +1 -1
  26. package/dist/wcardinal-ui.cjs.js +88 -48
  27. package/dist/wcardinal-ui.js +88 -48
  28. package/dist/wcardinal-ui.min.js +2 -2
  29. package/dist/wcardinal-ui.min.js.map +1 -1
  30. package/package.json +1 -1
@@ -1,4 +1,4 @@
1
1
  import { DImagePieceLayouterPart } from "./d-image-piece-layouter-part";
2
2
  export declare class DImagePieceLayouterPartBottom extends DImagePieceLayouterPart {
3
- execute(pbottom: number, height: number, marginAfter: boolean): void;
3
+ execute(pbottom: number, height: number): void;
4
4
  }
@@ -1,4 +1,4 @@
1
1
  import { DImagePieceLayouterPart } from "./d-image-piece-layouter-part";
2
2
  export declare class DImagePieceLayouterPartLeft extends DImagePieceLayouterPart {
3
- execute(pleft: number, marginAfter: boolean): void;
3
+ execute(pleft: number): void;
4
4
  }
@@ -1,4 +1,4 @@
1
1
  import { DImagePieceLayouterPart } from "./d-image-piece-layouter-part";
2
2
  export declare class DImagePieceLayouterPartRight extends DImagePieceLayouterPart {
3
- execute(pright: number, width: number, marginAfter: boolean): void;
3
+ execute(pright: number, width: number): void;
4
4
  }
@@ -1,4 +1,4 @@
1
1
  import { DImagePieceLayouterPart } from "./d-image-piece-layouter-part";
2
2
  export declare class DImagePieceLayouterPartTop extends DImagePieceLayouterPart {
3
- execute(ptop: number, marginAfter: boolean): void;
3
+ execute(ptop: number): void;
4
4
  }
@@ -1,8 +1,13 @@
1
+ import { DDynamicText } from "./d-dynamic-text";
1
2
  import { DImagePiece } from "./d-image-piece";
2
3
  export declare class DImagePieceLayouterPart {
3
- pieces: DImagePiece[];
4
- size: number;
4
+ protected _pieces: DImagePiece[];
5
+ protected _size: number;
6
+ protected _margin: number;
7
+ protected _text?: DDynamicText | null;
5
8
  constructor();
6
9
  clear(): void;
7
10
  add(image: DImagePiece, size: number, margin: number): void;
11
+ set(text: DDynamicText | null): void;
12
+ get size(): number;
8
13
  }
@@ -5,10 +5,10 @@ var DImagePieceLayouterPartBottom = /** @class */ (function (_super) {
5
5
  function DImagePieceLayouterPartBottom() {
6
6
  return _super !== null && _super.apply(this, arguments) || this;
7
7
  }
8
- DImagePieceLayouterPartBottom.prototype.execute = function (pbottom, height, marginAfter) {
9
- var pieces = this.pieces;
8
+ DImagePieceLayouterPartBottom.prototype.execute = function (pbottom, height) {
9
+ var pieces = this._pieces;
10
10
  var y = height - pbottom;
11
- if (marginAfter) {
11
+ if (this._text !== undefined) {
12
12
  var margin = 0;
13
13
  for (var i = 0, imax = pieces.length; i < imax; ++i) {
14
14
  var piece = pieces[i];
@@ -1 +1 @@
1
- {"version":3,"file":"d-image-piece-layouter-part-bottom.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-bottom.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;IAAmD,iDAAuB;IAA1E;;IAoBA,CAAC;IAnBA,+CAAO,GAAP,UAAQ,OAAe,EAAE,MAAc,EAAE,WAAoB;QAC5D,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,GAAG,MAAM,GAAG,OAAO,CAAC;QACzB,IAAI,WAAW,EAAE;YAChB,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC,IAAI,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;gBACjC,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;gBACnB,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;aACjC;SACD;aAAM;YACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;gBAClD,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;aACnB;SACD;IACF,CAAC;IACF,oCAAC;AAAD,CAAC,AApBD,CAAmD,uBAAuB,GAoBzE","sourcesContent":["import { DImagePieceLayouterPart } from \"./d-image-piece-layouter-part\";\n\nexport class DImagePieceLayouterPartBottom extends DImagePieceLayouterPart {\n\texecute(pbottom: number, height: number, marginAfter: boolean): void {\n\t\tconst pieces = this.pieces;\n\t\tlet y = height - pbottom;\n\t\tif (marginAfter) {\n\t\t\tlet margin = 0;\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\ty -= margin + piece.bound.height;\n\t\t\t\tpiece.image!.y = y;\n\t\t\t\tmargin = piece.margin.horizontal;\n\t\t\t}\n\t\t} else {\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\ty -= piece.margin.horizontal + piece.bound.height;\n\t\t\t\tpiece.image!.y = y;\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
1
+ {"version":3,"file":"d-image-piece-layouter-part-bottom.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-bottom.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;IAAmD,iDAAuB;IAA1E;;IAoBA,CAAC;IAnBA,+CAAO,GAAP,UAAQ,OAAe,EAAE,MAAc;QACtC,IAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,GAAG,MAAM,GAAG,OAAO,CAAC;QACzB,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE;YAC7B,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC,IAAI,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;gBACjC,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;gBACnB,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;aACjC;SACD;aAAM;YACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;gBAClD,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;aACnB;SACD;IACF,CAAC;IACF,oCAAC;AAAD,CAAC,AApBD,CAAmD,uBAAuB,GAoBzE","sourcesContent":["import { DImagePieceLayouterPart } from \"./d-image-piece-layouter-part\";\n\nexport class DImagePieceLayouterPartBottom extends DImagePieceLayouterPart {\n\texecute(pbottom: number, height: number): void {\n\t\tconst pieces = this._pieces;\n\t\tlet y = height - pbottom;\n\t\tif (this._text !== undefined) {\n\t\t\tlet margin = 0;\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\ty -= margin + piece.bound.height;\n\t\t\t\tpiece.image!.y = y;\n\t\t\t\tmargin = piece.margin.horizontal;\n\t\t\t}\n\t\t} else {\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\ty -= piece.margin.horizontal + piece.bound.height;\n\t\t\t\tpiece.image!.y = y;\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
@@ -6,13 +6,13 @@ var DImagePieceLayouterPartCenter = /** @class */ (function (_super) {
6
6
  return _super !== null && _super.apply(this, arguments) || this;
7
7
  }
8
8
  DImagePieceLayouterPartCenter.prototype.add = function (image, size, margin) {
9
- var pieces = this.pieces;
9
+ var pieces = this._pieces;
10
10
  pieces.push(image);
11
- this.size = Math.max(this.size, size);
11
+ this._size = Math.max(this.size, size);
12
12
  };
13
13
  DImagePieceLayouterPartCenter.prototype.execute = function (pleft, pright, width) {
14
14
  var c = pleft + (width - pleft - pright) * 0.5;
15
- var pieces = this.pieces;
15
+ var pieces = this._pieces;
16
16
  for (var i = 0, imax = pieces.length; i < imax; ++i) {
17
17
  var piece = pieces[i];
18
18
  piece.image.x = c - piece.bound.width * 0.5;
@@ -1 +1 @@
1
- {"version":3,"file":"d-image-piece-layouter-part-center.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-center.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;IAAmD,iDAAuB;IAA1E;;IAeA,CAAC;IAdA,2CAAG,GAAH,UAAI,KAAkB,EAAE,IAAY,EAAE,MAAc;QACnD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,+CAAO,GAAP,UAAQ,KAAa,EAAE,MAAc,EAAE,KAAa;QACnD,IAAM,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC;QACjD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;YACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,CAAC;SAC7C;IACF,CAAC;IACF,oCAAC;AAAD,CAAC,AAfD,CAAmD,uBAAuB,GAezE","sourcesContent":["import { DImagePiece } from \"./d-image-piece\";\nimport { DImagePieceLayouterPart } from \"./d-image-piece-layouter-part\";\n\nexport class DImagePieceLayouterPartCenter extends DImagePieceLayouterPart {\n\tadd(image: DImagePiece, size: number, margin: number): void {\n\t\tconst pieces = this.pieces;\n\t\tpieces.push(image);\n\t\tthis.size = Math.max(this.size, size);\n\t}\n\n\texecute(pleft: number, pright: number, width: number): void {\n\t\tconst c = pleft + (width - pleft - pright) * 0.5;\n\t\tconst pieces = this.pieces;\n\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\tconst piece = pieces[i];\n\t\t\tpiece.image!.x = c - piece.bound.width * 0.5;\n\t\t}\n\t}\n}\n"]}
1
+ {"version":3,"file":"d-image-piece-layouter-part-center.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-center.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;IAAmD,iDAAuB;IAA1E;;IAeA,CAAC;IAdA,2CAAG,GAAH,UAAI,KAAkB,EAAE,IAAY,EAAE,MAAc;QACnD,IAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,+CAAO,GAAP,UAAQ,KAAa,EAAE,MAAc,EAAE,KAAa;QACnD,IAAM,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC;QACjD,IAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;YACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,CAAC;SAC7C;IACF,CAAC;IACF,oCAAC;AAAD,CAAC,AAfD,CAAmD,uBAAuB,GAezE","sourcesContent":["import { DImagePiece } from \"./d-image-piece\";\nimport { DImagePieceLayouterPart } from \"./d-image-piece-layouter-part\";\n\nexport class DImagePieceLayouterPartCenter extends DImagePieceLayouterPart {\n\tadd(image: DImagePiece, size: number, margin: number): void {\n\t\tconst pieces = this._pieces;\n\t\tpieces.push(image);\n\t\tthis._size = Math.max(this.size, size);\n\t}\n\n\texecute(pleft: number, pright: number, width: number): void {\n\t\tconst c = pleft + (width - pleft - pright) * 0.5;\n\t\tconst pieces = this._pieces;\n\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\tconst piece = pieces[i];\n\t\t\tpiece.image!.x = c - piece.bound.width * 0.5;\n\t\t}\n\t}\n}\n"]}
@@ -59,19 +59,33 @@ var DImagePieceLayouterPartContainer = /** @class */ (function () {
59
59
  }
60
60
  };
61
61
  DImagePieceLayouterPartContainer.prototype.set = function (text) {
62
+ this.left.set(text);
63
+ this.center.set(text);
64
+ this.right.set(text);
65
+ this.top.set(text);
66
+ this.middle.set(text);
67
+ this.bottom.set(text);
62
68
  this.text = text;
63
69
  };
64
70
  Object.defineProperty(DImagePieceLayouterPartContainer.prototype, "width", {
65
71
  get: function () {
66
72
  var text = this.text;
67
73
  var left = this.left;
74
+ var leftSize = left.size;
68
75
  var center = this.center;
76
+ var centerSize = center.size;
69
77
  var right = this.right;
70
- if (text) {
71
- return Math.max(left.size + text.width + right.size, center.size);
78
+ var rightSize = right.size;
79
+ if (text !== undefined) {
80
+ if (text !== null) {
81
+ return Math.max(leftSize + text.width + rightSize, centerSize);
82
+ }
83
+ else {
84
+ return Math.max(leftSize + rightSize, centerSize);
85
+ }
72
86
  }
73
87
  else {
74
- return Math.max(left.size, right.size, center.size);
88
+ return Math.max(leftSize, rightSize, centerSize);
75
89
  }
76
90
  },
77
91
  enumerable: false,
@@ -81,13 +95,21 @@ var DImagePieceLayouterPartContainer = /** @class */ (function () {
81
95
  get: function () {
82
96
  var text = this.text;
83
97
  var top = this.top;
98
+ var topSize = top.size;
84
99
  var middle = this.middle;
100
+ var middleSize = middle.size;
85
101
  var bottom = this.bottom;
86
- if (text) {
87
- return Math.max(top.size + text.height + bottom.size, middle.size);
102
+ var bottomSize = bottom.size;
103
+ if (text !== undefined) {
104
+ if (text !== null) {
105
+ return Math.max(topSize + text.height + bottomSize, middleSize);
106
+ }
107
+ else {
108
+ return Math.max(topSize + bottomSize, middleSize);
109
+ }
88
110
  }
89
111
  else {
90
- return Math.max(top.size, bottom.size, middle.size);
112
+ return Math.max(topSize, bottomSize, middleSize);
91
113
  }
92
114
  },
93
115
  enumerable: false,
@@ -102,6 +124,10 @@ var DImagePieceLayouterPartContainer = /** @class */ (function () {
102
124
  var bottom = this.bottom;
103
125
  var text = this.text;
104
126
  if (text !== undefined) {
127
+ var leftSize = left.size;
128
+ var rightSize = right.size;
129
+ var topSize = top.size;
130
+ var bottomSize = bottom.size;
105
131
  var textX = 0;
106
132
  var textWidth = 0;
107
133
  var textHeight = 0;
@@ -111,51 +137,51 @@ var DImagePieceLayouterPartContainer = /** @class */ (function () {
111
137
  }
112
138
  switch (textAlign.horizontal) {
113
139
  case DAlignHorizontal.LEFT:
114
- textX = pleft + left.size;
140
+ textX = pleft + leftSize;
115
141
  break;
116
142
  case DAlignHorizontal.CENTER:
117
143
  textX =
118
144
  pleft +
119
- (width - pleft - pright - (left.size + textWidth + right.size)) * 0.5 +
120
- left.size;
145
+ (width - pleft - pright - (leftSize + textWidth + rightSize)) * 0.5 +
146
+ leftSize;
121
147
  break;
122
148
  case DAlignHorizontal.RIGHT:
123
- textX = width - pright - right.size - textWidth;
149
+ textX = width - pright - rightSize - textWidth;
124
150
  break;
125
151
  }
126
152
  var textY = 0;
127
153
  switch (textAlign.vertical) {
128
154
  case DAlignVertical.TOP:
129
- textY = ptop + top.size;
155
+ textY = ptop + topSize;
130
156
  break;
131
157
  case DAlignVertical.MIDDLE:
132
158
  textY =
133
159
  ptop +
134
- (height - ptop - pbottom - (top.size + textHeight + bottom.size)) * 0.5 +
135
- top.size;
160
+ (height - ptop - pbottom - (topSize + textHeight + bottomSize)) * 0.5 +
161
+ topSize;
136
162
  break;
137
163
  case DAlignVertical.BOTTOM:
138
- textY = height - pbottom - bottom.size - textHeight;
164
+ textY = height - pbottom - bottomSize - textHeight;
139
165
  break;
140
166
  }
141
167
  if (text != null) {
142
168
  text.position.set(textX, textY);
143
- text.setClippingDelta(left.size + right.size, top.size + bottom.size);
169
+ text.setClippingDelta(leftSize + rightSize, topSize + bottomSize);
144
170
  }
145
- left.execute(textX - left.size, true);
171
+ left.execute(textX - leftSize);
146
172
  center.execute(0, 0, textX * 2 + textWidth);
147
- right.execute(0, textX + textWidth + right.size, true);
148
- top.execute(textY - top.size, true);
173
+ right.execute(0, textX + textWidth + rightSize);
174
+ top.execute(textY - topSize);
149
175
  middle.execute(0, 0, textY * 2 + textHeight);
150
- bottom.execute(0, textY + textHeight + bottom.size, true);
176
+ bottom.execute(0, textY + textHeight + bottomSize);
151
177
  }
152
178
  else {
153
- left.execute(pleft, false);
179
+ left.execute(pleft);
154
180
  center.execute(pleft, pright, width);
155
- right.execute(pright, width, false);
156
- top.execute(ptop, false);
181
+ right.execute(pright, width);
182
+ top.execute(ptop);
157
183
  middle.execute(ptop, pbottom, height);
158
- bottom.execute(pbottom, height, false);
184
+ bottom.execute(pbottom, height);
159
185
  }
160
186
  };
161
187
  return DImagePieceLayouterPartContainer;
@@ -1 +1 @@
1
- {"version":3,"file":"d-image-piece-layouter-part-container.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-container.ts"],"names":[],"mappings":"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","sourcesContent":["import { DAlignHorizontal } from \"./d-align-horizontal\";\nimport { DAlignVertical } from \"./d-align-vertical\";\nimport { DDynamicText } from \"./d-dynamic-text\";\nimport { DImagePiece } from \"./d-image-piece\";\nimport { DImagePieceLayouterPartBottom } from \"./d-image-piece-layouter-part-bottom\";\nimport { DImagePieceLayouterPartCenter } from \"./d-image-piece-layouter-part-center\";\nimport { DImagePieceLayouterPartLeft } from \"./d-image-piece-layouter-part-left\";\nimport { DImagePieceLayouterPartMiddle } from \"./d-image-piece-layouter-part-middle\";\nimport { DImagePieceLayouterPartRight } from \"./d-image-piece-layouter-part-right\";\nimport { DImagePieceLayouterPartTop } from \"./d-image-piece-layouter-part-top\";\nimport { DTextBaseAlign } from \"./d-text-base\";\n\nexport class DImagePieceLayouterPartContainer {\n\tleft: DImagePieceLayouterPartLeft;\n\tcenter: DImagePieceLayouterPartCenter;\n\tright: DImagePieceLayouterPartRight;\n\ttop: DImagePieceLayouterPartTop;\n\tmiddle: DImagePieceLayouterPartMiddle;\n\tbottom: DImagePieceLayouterPartBottom;\n\n\ttext?: DDynamicText | null;\n\n\tconstructor() {\n\t\tthis.left = new DImagePieceLayouterPartLeft();\n\t\tthis.center = new DImagePieceLayouterPartCenter();\n\t\tthis.right = new DImagePieceLayouterPartRight();\n\t\tthis.top = new DImagePieceLayouterPartTop();\n\t\tthis.middle = new DImagePieceLayouterPartMiddle();\n\t\tthis.bottom = new DImagePieceLayouterPartBottom();\n\t}\n\n\tclear(): void {\n\t\tthis.left.clear();\n\t\tthis.center.clear();\n\t\tthis.right.clear();\n\t\tthis.top.clear();\n\t\tthis.middle.clear();\n\t\tthis.bottom.clear();\n\t\tthis.text = undefined;\n\t}\n\n\tadd(image: DImagePiece): void {\n\t\tconst imageImage = image.image;\n\t\tif (imageImage != null) {\n\t\t\tconst imageBound = image.bound;\n\t\t\tconst imageBoundWidth = imageBound.width;\n\t\t\tconst imageBoundHeight = imageBound.height;\n\n\t\t\tconst imageMargin = image.margin;\n\t\t\tconst imageMarginHorizontal = imageMargin.horizontal;\n\t\t\tconst imageMarginVertical = imageMargin.vertical;\n\n\t\t\tconst imageAlign = image.align;\n\t\t\tswitch (imageAlign.horizontal) {\n\t\t\t\tcase DAlignHorizontal.LEFT:\n\t\t\t\t\tthis.left.add(image, imageBoundWidth, imageMarginHorizontal);\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignHorizontal.CENTER:\n\t\t\t\t\tthis.center.add(image, imageBoundWidth, imageMarginHorizontal);\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignHorizontal.RIGHT:\n\t\t\t\t\tthis.right.add(image, imageBoundWidth, imageMarginHorizontal);\n\t\t\t\t\tbreak;\n\t\t\t}\n\t\t\tswitch (imageAlign.vertical) {\n\t\t\t\tcase DAlignVertical.TOP:\n\t\t\t\t\tthis.top.add(image, imageBoundHeight, imageMarginVertical);\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignVertical.MIDDLE:\n\t\t\t\t\tthis.middle.add(image, imageBoundHeight, imageMarginVertical);\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignVertical.BOTTOM:\n\t\t\t\t\tthis.bottom.add(image, imageBoundHeight, imageMarginVertical);\n\t\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t}\n\n\tset(text: DDynamicText | null): void {\n\t\tthis.text = text;\n\t}\n\n\tget width(): number {\n\t\tconst text = this.text;\n\t\tconst left = this.left;\n\t\tconst center = this.center;\n\t\tconst right = this.right;\n\t\tif (text) {\n\t\t\treturn Math.max(left.size + text.width + right.size, center.size);\n\t\t} else {\n\t\t\treturn Math.max(left.size, right.size, center.size);\n\t\t}\n\t}\n\n\tget height(): number {\n\t\tconst text = this.text;\n\t\tconst top = this.top;\n\t\tconst middle = this.middle;\n\t\tconst bottom = this.bottom;\n\t\tif (text) {\n\t\t\treturn Math.max(top.size + text.height + bottom.size, middle.size);\n\t\t} else {\n\t\t\treturn Math.max(top.size, bottom.size, middle.size);\n\t\t}\n\t}\n\n\texecute(\n\t\tpleft: number,\n\t\tptop: number,\n\t\tpright: number,\n\t\tpbottom: number,\n\t\ttextAlign: DTextBaseAlign,\n\t\twidth: number,\n\t\theight: number\n\t): void {\n\t\tconst left = this.left;\n\t\tconst center = this.center;\n\t\tconst right = this.right;\n\t\tconst top = this.top;\n\t\tconst middle = this.middle;\n\t\tconst bottom = this.bottom;\n\n\t\tconst text = this.text;\n\t\tif (text !== undefined) {\n\t\t\tlet textX = 0;\n\t\t\tlet textWidth = 0;\n\t\t\tlet textHeight = 0;\n\t\t\tif (text != null) {\n\t\t\t\ttextWidth = text.width;\n\t\t\t\ttextHeight = text.height;\n\t\t\t}\n\t\t\tswitch (textAlign.horizontal) {\n\t\t\t\tcase DAlignHorizontal.LEFT:\n\t\t\t\t\ttextX = pleft + left.size;\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignHorizontal.CENTER:\n\t\t\t\t\ttextX =\n\t\t\t\t\t\tpleft +\n\t\t\t\t\t\t(width - pleft - pright - (left.size + textWidth + right.size)) * 0.5 +\n\t\t\t\t\t\tleft.size;\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignHorizontal.RIGHT:\n\t\t\t\t\ttextX = width - pright - right.size - textWidth;\n\t\t\t\t\tbreak;\n\t\t\t}\n\n\t\t\tlet textY = 0;\n\t\t\tswitch (textAlign.vertical) {\n\t\t\t\tcase DAlignVertical.TOP:\n\t\t\t\t\ttextY = ptop + top.size;\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignVertical.MIDDLE:\n\t\t\t\t\ttextY =\n\t\t\t\t\t\tptop +\n\t\t\t\t\t\t(height - ptop - pbottom - (top.size + textHeight + bottom.size)) * 0.5 +\n\t\t\t\t\t\ttop.size;\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignVertical.BOTTOM:\n\t\t\t\t\ttextY = height - pbottom - bottom.size - textHeight;\n\t\t\t\t\tbreak;\n\t\t\t}\n\t\t\tif (text != null) {\n\t\t\t\ttext.position.set(textX, textY);\n\t\t\t\ttext.setClippingDelta(left.size + right.size, top.size + bottom.size);\n\t\t\t}\n\t\t\tleft.execute(textX - left.size, true);\n\t\t\tcenter.execute(0, 0, textX * 2 + textWidth);\n\t\t\tright.execute(0, textX + textWidth + right.size, true);\n\t\t\ttop.execute(textY - top.size, true);\n\t\t\tmiddle.execute(0, 0, textY * 2 + textHeight);\n\t\t\tbottom.execute(0, textY + textHeight + bottom.size, true);\n\t\t} else {\n\t\t\tleft.execute(pleft, false);\n\t\t\tcenter.execute(pleft, pright, width);\n\t\t\tright.execute(pright, width, false);\n\t\t\ttop.execute(ptop, false);\n\t\t\tmiddle.execute(ptop, pbottom, height);\n\t\t\tbottom.execute(pbottom, height, false);\n\t\t}\n\t}\n}\n"]}
1
+ {"version":3,"file":"d-image-piece-layouter-part-container.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-container.ts"],"names":[],"mappings":"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","sourcesContent":["import { DAlignHorizontal } from \"./d-align-horizontal\";\nimport { DAlignVertical } from \"./d-align-vertical\";\nimport { DDynamicText } from \"./d-dynamic-text\";\nimport { DImagePiece } from \"./d-image-piece\";\nimport { DImagePieceLayouterPartBottom } from \"./d-image-piece-layouter-part-bottom\";\nimport { DImagePieceLayouterPartCenter } from \"./d-image-piece-layouter-part-center\";\nimport { DImagePieceLayouterPartLeft } from \"./d-image-piece-layouter-part-left\";\nimport { DImagePieceLayouterPartMiddle } from \"./d-image-piece-layouter-part-middle\";\nimport { DImagePieceLayouterPartRight } from \"./d-image-piece-layouter-part-right\";\nimport { DImagePieceLayouterPartTop } from \"./d-image-piece-layouter-part-top\";\nimport { DTextBaseAlign } from \"./d-text-base\";\n\nexport class DImagePieceLayouterPartContainer {\n\tleft: DImagePieceLayouterPartLeft;\n\tcenter: DImagePieceLayouterPartCenter;\n\tright: DImagePieceLayouterPartRight;\n\ttop: DImagePieceLayouterPartTop;\n\tmiddle: DImagePieceLayouterPartMiddle;\n\tbottom: DImagePieceLayouterPartBottom;\n\n\ttext?: DDynamicText | null;\n\n\tconstructor() {\n\t\tthis.left = new DImagePieceLayouterPartLeft();\n\t\tthis.center = new DImagePieceLayouterPartCenter();\n\t\tthis.right = new DImagePieceLayouterPartRight();\n\t\tthis.top = new DImagePieceLayouterPartTop();\n\t\tthis.middle = new DImagePieceLayouterPartMiddle();\n\t\tthis.bottom = new DImagePieceLayouterPartBottom();\n\t}\n\n\tclear(): void {\n\t\tthis.left.clear();\n\t\tthis.center.clear();\n\t\tthis.right.clear();\n\t\tthis.top.clear();\n\t\tthis.middle.clear();\n\t\tthis.bottom.clear();\n\t\tthis.text = undefined;\n\t}\n\n\tadd(image: DImagePiece): void {\n\t\tconst imageImage = image.image;\n\t\tif (imageImage != null) {\n\t\t\tconst imageBound = image.bound;\n\t\t\tconst imageBoundWidth = imageBound.width;\n\t\t\tconst imageBoundHeight = imageBound.height;\n\n\t\t\tconst imageMargin = image.margin;\n\t\t\tconst imageMarginHorizontal = imageMargin.horizontal;\n\t\t\tconst imageMarginVertical = imageMargin.vertical;\n\n\t\t\tconst imageAlign = image.align;\n\t\t\tswitch (imageAlign.horizontal) {\n\t\t\t\tcase DAlignHorizontal.LEFT:\n\t\t\t\t\tthis.left.add(image, imageBoundWidth, imageMarginHorizontal);\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignHorizontal.CENTER:\n\t\t\t\t\tthis.center.add(image, imageBoundWidth, imageMarginHorizontal);\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignHorizontal.RIGHT:\n\t\t\t\t\tthis.right.add(image, imageBoundWidth, imageMarginHorizontal);\n\t\t\t\t\tbreak;\n\t\t\t}\n\t\t\tswitch (imageAlign.vertical) {\n\t\t\t\tcase DAlignVertical.TOP:\n\t\t\t\t\tthis.top.add(image, imageBoundHeight, imageMarginVertical);\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignVertical.MIDDLE:\n\t\t\t\t\tthis.middle.add(image, imageBoundHeight, imageMarginVertical);\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignVertical.BOTTOM:\n\t\t\t\t\tthis.bottom.add(image, imageBoundHeight, imageMarginVertical);\n\t\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t}\n\n\tset(text: DDynamicText | null): void {\n\t\tthis.left.set(text);\n\t\tthis.center.set(text);\n\t\tthis.right.set(text);\n\t\tthis.top.set(text);\n\t\tthis.middle.set(text);\n\t\tthis.bottom.set(text);\n\t\tthis.text = text;\n\t}\n\n\tget width(): number {\n\t\tconst text = this.text;\n\t\tconst left = this.left;\n\t\tconst leftSize = left.size;\n\t\tconst center = this.center;\n\t\tconst centerSize = center.size;\n\t\tconst right = this.right;\n\t\tconst rightSize = right.size;\n\t\tif (text !== undefined) {\n\t\t\tif (text !== null) {\n\t\t\t\treturn Math.max(leftSize + text.width + rightSize, centerSize);\n\t\t\t} else {\n\t\t\t\treturn Math.max(leftSize + rightSize, centerSize);\n\t\t\t}\n\t\t} else {\n\t\t\treturn Math.max(leftSize, rightSize, centerSize);\n\t\t}\n\t}\n\n\tget height(): number {\n\t\tconst text = this.text;\n\t\tconst top = this.top;\n\t\tconst topSize = top.size;\n\t\tconst middle = this.middle;\n\t\tconst middleSize = middle.size;\n\t\tconst bottom = this.bottom;\n\t\tconst bottomSize = bottom.size;\n\t\tif (text !== undefined) {\n\t\t\tif (text !== null) {\n\t\t\t\treturn Math.max(topSize + text.height + bottomSize, middleSize);\n\t\t\t} else {\n\t\t\t\treturn Math.max(topSize + bottomSize, middleSize);\n\t\t\t}\n\t\t} else {\n\t\t\treturn Math.max(topSize, bottomSize, middleSize);\n\t\t}\n\t}\n\n\texecute(\n\t\tpleft: number,\n\t\tptop: number,\n\t\tpright: number,\n\t\tpbottom: number,\n\t\ttextAlign: DTextBaseAlign,\n\t\twidth: number,\n\t\theight: number\n\t): void {\n\t\tconst left = this.left;\n\t\tconst center = this.center;\n\t\tconst right = this.right;\n\t\tconst top = this.top;\n\t\tconst middle = this.middle;\n\t\tconst bottom = this.bottom;\n\n\t\tconst text = this.text;\n\t\tif (text !== undefined) {\n\t\t\tconst leftSize = left.size;\n\t\t\tconst rightSize = right.size;\n\t\t\tconst topSize = top.size;\n\t\t\tconst bottomSize = bottom.size;\n\n\t\t\tlet textX = 0;\n\t\t\tlet textWidth = 0;\n\t\t\tlet textHeight = 0;\n\t\t\tif (text != null) {\n\t\t\t\ttextWidth = text.width;\n\t\t\t\ttextHeight = text.height;\n\t\t\t}\n\t\t\tswitch (textAlign.horizontal) {\n\t\t\t\tcase DAlignHorizontal.LEFT:\n\t\t\t\t\ttextX = pleft + leftSize;\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignHorizontal.CENTER:\n\t\t\t\t\ttextX =\n\t\t\t\t\t\tpleft +\n\t\t\t\t\t\t(width - pleft - pright - (leftSize + textWidth + rightSize)) * 0.5 +\n\t\t\t\t\t\tleftSize;\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignHorizontal.RIGHT:\n\t\t\t\t\ttextX = width - pright - rightSize - textWidth;\n\t\t\t\t\tbreak;\n\t\t\t}\n\n\t\t\tlet textY = 0;\n\t\t\tswitch (textAlign.vertical) {\n\t\t\t\tcase DAlignVertical.TOP:\n\t\t\t\t\ttextY = ptop + topSize;\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignVertical.MIDDLE:\n\t\t\t\t\ttextY =\n\t\t\t\t\t\tptop +\n\t\t\t\t\t\t(height - ptop - pbottom - (topSize + textHeight + bottomSize)) * 0.5 +\n\t\t\t\t\t\ttopSize;\n\t\t\t\t\tbreak;\n\t\t\t\tcase DAlignVertical.BOTTOM:\n\t\t\t\t\ttextY = height - pbottom - bottomSize - textHeight;\n\t\t\t\t\tbreak;\n\t\t\t}\n\t\t\tif (text != null) {\n\t\t\t\ttext.position.set(textX, textY);\n\t\t\t\ttext.setClippingDelta(leftSize + rightSize, topSize + bottomSize);\n\t\t\t}\n\t\t\tleft.execute(textX - leftSize);\n\t\t\tcenter.execute(0, 0, textX * 2 + textWidth);\n\t\t\tright.execute(0, textX + textWidth + rightSize);\n\t\t\ttop.execute(textY - topSize);\n\t\t\tmiddle.execute(0, 0, textY * 2 + textHeight);\n\t\t\tbottom.execute(0, textY + textHeight + bottomSize);\n\t\t} else {\n\t\t\tleft.execute(pleft);\n\t\t\tcenter.execute(pleft, pright, width);\n\t\t\tright.execute(pright, width);\n\t\t\ttop.execute(ptop);\n\t\t\tmiddle.execute(ptop, pbottom, height);\n\t\t\tbottom.execute(pbottom, height);\n\t\t}\n\t}\n}\n"]}
@@ -5,10 +5,10 @@ var DImagePieceLayouterPartLeft = /** @class */ (function (_super) {
5
5
  function DImagePieceLayouterPartLeft() {
6
6
  return _super !== null && _super.apply(this, arguments) || this;
7
7
  }
8
- DImagePieceLayouterPartLeft.prototype.execute = function (pleft, marginAfter) {
9
- var pieces = this.pieces;
8
+ DImagePieceLayouterPartLeft.prototype.execute = function (pleft) {
9
+ var pieces = this._pieces;
10
10
  var x = pleft;
11
- if (marginAfter) {
11
+ if (this._text !== undefined) {
12
12
  for (var i = 0, imax = pieces.length; i < imax; ++i) {
13
13
  var piece = pieces[i];
14
14
  piece.image.x = x;
@@ -1 +1 @@
1
- {"version":3,"file":"d-image-piece-layouter-part-left.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-left.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;IAAiD,+CAAuB;IAAxE;;IAmBA,CAAC;IAlBA,6CAAO,GAAP,UAAQ,KAAa,EAAE,WAAoB;QAC1C,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,GAAG,KAAK,CAAC;QACd,IAAI,WAAW,EAAE;YAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;aACjD;SACD;aAAM;YACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;gBAC7B,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;aACvB;SACD;IACF,CAAC;IACF,kCAAC;AAAD,CAAC,AAnBD,CAAiD,uBAAuB,GAmBvE","sourcesContent":["import { DImagePieceLayouterPart } from \"./d-image-piece-layouter-part\";\n\nexport class DImagePieceLayouterPartLeft extends DImagePieceLayouterPart {\n\texecute(pleft: number, marginAfter: boolean): void {\n\t\tconst pieces = this.pieces;\n\t\tlet x = pleft;\n\t\tif (marginAfter) {\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\tpiece.image!.x = x;\n\t\t\t\tx += piece.bound.width + piece.margin.horizontal;\n\t\t\t}\n\t\t} else {\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\tx += piece.margin.horizontal;\n\t\t\t\tpiece.image!.x = x;\n\t\t\t\tx += piece.bound.width;\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
1
+ {"version":3,"file":"d-image-piece-layouter-part-left.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-left.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;IAAiD,+CAAuB;IAAxE;;IAmBA,CAAC;IAlBA,6CAAO,GAAP,UAAQ,KAAa;QACpB,IAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,GAAG,KAAK,CAAC;QACd,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE;YAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;aACjD;SACD;aAAM;YACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;gBAC7B,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;aACvB;SACD;IACF,CAAC;IACF,kCAAC;AAAD,CAAC,AAnBD,CAAiD,uBAAuB,GAmBvE","sourcesContent":["import { DImagePieceLayouterPart } from \"./d-image-piece-layouter-part\";\n\nexport class DImagePieceLayouterPartLeft extends DImagePieceLayouterPart {\n\texecute(pleft: number): void {\n\t\tconst pieces = this._pieces;\n\t\tlet x = pleft;\n\t\tif (this._text !== undefined) {\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\tpiece.image!.x = x;\n\t\t\t\tx += piece.bound.width + piece.margin.horizontal;\n\t\t\t}\n\t\t} else {\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\tx += piece.margin.horizontal;\n\t\t\t\tpiece.image!.x = x;\n\t\t\t\tx += piece.bound.width;\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
@@ -6,13 +6,13 @@ var DImagePieceLayouterPartMiddle = /** @class */ (function (_super) {
6
6
  return _super !== null && _super.apply(this, arguments) || this;
7
7
  }
8
8
  DImagePieceLayouterPartMiddle.prototype.add = function (image, size, margin) {
9
- var pieces = this.pieces;
9
+ var pieces = this._pieces;
10
10
  pieces.push(image);
11
- this.size = Math.max(this.size, size);
11
+ this._size = Math.max(this.size, size);
12
12
  };
13
13
  DImagePieceLayouterPartMiddle.prototype.execute = function (ptop, pbottom, height) {
14
14
  var c = ptop + (height - ptop - pbottom) * 0.5;
15
- var pieces = this.pieces;
15
+ var pieces = this._pieces;
16
16
  for (var i = 0, imax = pieces.length; i < imax; ++i) {
17
17
  var piece = pieces[i];
18
18
  piece.image.y = c - piece.bound.height * 0.5;
@@ -1 +1 @@
1
- {"version":3,"file":"d-image-piece-layouter-part-middle.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-middle.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;IAAmD,iDAAuB;IAA1E;;IAeA,CAAC;IAdA,2CAAG,GAAH,UAAI,KAAkB,EAAE,IAAY,EAAE,MAAc;QACnD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,+CAAO,GAAP,UAAQ,IAAY,EAAE,OAAe,EAAE,MAAc;QACpD,IAAM,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,GAAG,GAAG,CAAC;QACjD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;YACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC;SAC9C;IACF,CAAC;IACF,oCAAC;AAAD,CAAC,AAfD,CAAmD,uBAAuB,GAezE","sourcesContent":["import { DImagePiece } from \"./d-image-piece\";\nimport { DImagePieceLayouterPart } from \"./d-image-piece-layouter-part\";\n\nexport class DImagePieceLayouterPartMiddle extends DImagePieceLayouterPart {\n\tadd(image: DImagePiece, size: number, margin: number): void {\n\t\tconst pieces = this.pieces;\n\t\tpieces.push(image);\n\t\tthis.size = Math.max(this.size, size);\n\t}\n\n\texecute(ptop: number, pbottom: number, height: number): void {\n\t\tconst c = ptop + (height - ptop - pbottom) * 0.5;\n\t\tconst pieces = this.pieces;\n\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\tconst piece = pieces[i];\n\t\t\tpiece.image!.y = c - piece.bound.height * 0.5;\n\t\t}\n\t}\n}\n"]}
1
+ {"version":3,"file":"d-image-piece-layouter-part-middle.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-middle.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;IAAmD,iDAAuB;IAA1E;;IAeA,CAAC;IAdA,2CAAG,GAAH,UAAI,KAAkB,EAAE,IAAY,EAAE,MAAc;QACnD,IAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,+CAAO,GAAP,UAAQ,IAAY,EAAE,OAAe,EAAE,MAAc;QACpD,IAAM,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,GAAG,GAAG,CAAC;QACjD,IAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;YACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC;SAC9C;IACF,CAAC;IACF,oCAAC;AAAD,CAAC,AAfD,CAAmD,uBAAuB,GAezE","sourcesContent":["import { DImagePiece } from \"./d-image-piece\";\nimport { DImagePieceLayouterPart } from \"./d-image-piece-layouter-part\";\n\nexport class DImagePieceLayouterPartMiddle extends DImagePieceLayouterPart {\n\tadd(image: DImagePiece, size: number, margin: number): void {\n\t\tconst pieces = this._pieces;\n\t\tpieces.push(image);\n\t\tthis._size = Math.max(this.size, size);\n\t}\n\n\texecute(ptop: number, pbottom: number, height: number): void {\n\t\tconst c = ptop + (height - ptop - pbottom) * 0.5;\n\t\tconst pieces = this._pieces;\n\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\tconst piece = pieces[i];\n\t\t\tpiece.image!.y = c - piece.bound.height * 0.5;\n\t\t}\n\t}\n}\n"]}
@@ -5,10 +5,10 @@ var DImagePieceLayouterPartRight = /** @class */ (function (_super) {
5
5
  function DImagePieceLayouterPartRight() {
6
6
  return _super !== null && _super.apply(this, arguments) || this;
7
7
  }
8
- DImagePieceLayouterPartRight.prototype.execute = function (pright, width, marginAfter) {
9
- var pieces = this.pieces;
8
+ DImagePieceLayouterPartRight.prototype.execute = function (pright, width) {
9
+ var pieces = this._pieces;
10
10
  var x = width - pright;
11
- if (marginAfter) {
11
+ if (this._text !== undefined) {
12
12
  var margin = 0;
13
13
  for (var i = 0, imax = pieces.length; i < imax; ++i) {
14
14
  var piece = pieces[i];
@@ -1 +1 @@
1
- {"version":3,"file":"d-image-piece-layouter-part-right.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-right.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;IAAkD,gDAAuB;IAAzE;;IAoBA,CAAC;IAnBA,8CAAO,GAAP,UAAQ,MAAc,EAAE,KAAa,EAAE,WAAoB;QAC1D,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,GAAG,KAAK,GAAG,MAAM,CAAC;QACvB,IAAI,WAAW,EAAE;YAChB,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC,IAAI,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;gBAChC,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;gBACnB,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;aACjC;SACD;aAAM;YACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;gBACjD,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;aACnB;SACD;IACF,CAAC;IACF,mCAAC;AAAD,CAAC,AApBD,CAAkD,uBAAuB,GAoBxE","sourcesContent":["import { DImagePieceLayouterPart } from \"./d-image-piece-layouter-part\";\n\nexport class DImagePieceLayouterPartRight extends DImagePieceLayouterPart {\n\texecute(pright: number, width: number, marginAfter: boolean): void {\n\t\tconst pieces = this.pieces;\n\t\tlet x = width - pright;\n\t\tif (marginAfter) {\n\t\t\tlet margin = 0;\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\tx -= margin + piece.bound.width;\n\t\t\t\tpiece.image!.x = x;\n\t\t\t\tmargin = piece.margin.horizontal;\n\t\t\t}\n\t\t} else {\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\tx -= piece.margin.horizontal + piece.bound.width;\n\t\t\t\tpiece.image!.x = x;\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
1
+ {"version":3,"file":"d-image-piece-layouter-part-right.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-right.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;IAAkD,gDAAuB;IAAzE;;IAoBA,CAAC;IAnBA,8CAAO,GAAP,UAAQ,MAAc,EAAE,KAAa;QACpC,IAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,GAAG,KAAK,GAAG,MAAM,CAAC;QACvB,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE;YAC7B,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC,IAAI,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;gBAChC,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;gBACnB,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;aACjC;SACD;aAAM;YACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;gBACjD,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;aACnB;SACD;IACF,CAAC;IACF,mCAAC;AAAD,CAAC,AApBD,CAAkD,uBAAuB,GAoBxE","sourcesContent":["import { DImagePieceLayouterPart } from \"./d-image-piece-layouter-part\";\n\nexport class DImagePieceLayouterPartRight extends DImagePieceLayouterPart {\n\texecute(pright: number, width: number): void {\n\t\tconst pieces = this._pieces;\n\t\tlet x = width - pright;\n\t\tif (this._text !== undefined) {\n\t\t\tlet margin = 0;\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\tx -= margin + piece.bound.width;\n\t\t\t\tpiece.image!.x = x;\n\t\t\t\tmargin = piece.margin.horizontal;\n\t\t\t}\n\t\t} else {\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\tx -= piece.margin.horizontal + piece.bound.width;\n\t\t\t\tpiece.image!.x = x;\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
@@ -5,10 +5,10 @@ var DImagePieceLayouterPartTop = /** @class */ (function (_super) {
5
5
  function DImagePieceLayouterPartTop() {
6
6
  return _super !== null && _super.apply(this, arguments) || this;
7
7
  }
8
- DImagePieceLayouterPartTop.prototype.execute = function (ptop, marginAfter) {
9
- var pieces = this.pieces;
8
+ DImagePieceLayouterPartTop.prototype.execute = function (ptop) {
9
+ var pieces = this._pieces;
10
10
  var y = ptop;
11
- if (marginAfter) {
11
+ if (this._text !== undefined) {
12
12
  var margin = 0;
13
13
  for (var i = 0, imax = pieces.length; i < imax; ++i) {
14
14
  var piece = pieces[i];
@@ -1 +1 @@
1
- {"version":3,"file":"d-image-piece-layouter-part-top.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-top.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;IAAgD,8CAAuB;IAAvE;;IAqBA,CAAC;IApBA,4CAAO,GAAP,UAAQ,IAAY,EAAE,WAAoB;QACzC,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,GAAG,IAAI,CAAC;QACb,IAAI,WAAW,EAAE;YAChB,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;gBAC5B,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;gBACxB,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;aAC/B;SACD;aAAM;YACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC3B,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;aACxB;SACD;IACF,CAAC;IACF,iCAAC;AAAD,CAAC,AArBD,CAAgD,uBAAuB,GAqBtE","sourcesContent":["import { DImagePieceLayouterPart } from \"./d-image-piece-layouter-part\";\n\nexport class DImagePieceLayouterPartTop extends DImagePieceLayouterPart {\n\texecute(ptop: number, marginAfter: boolean): void {\n\t\tconst pieces = this.pieces;\n\t\tlet y = ptop;\n\t\tif (marginAfter) {\n\t\t\tlet margin = 0;\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\tpiece.image!.y = margin + y;\n\t\t\t\ty += piece.bound.height;\n\t\t\t\tmargin = piece.margin.vertical;\n\t\t\t}\n\t\t} else {\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\ty += piece.margin.vertical;\n\t\t\t\tpiece.image!.y = y;\n\t\t\t\ty += piece.bound.height;\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
1
+ {"version":3,"file":"d-image-piece-layouter-part-top.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part-top.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;IAAgD,8CAAuB;IAAvE;;IAqBA,CAAC;IApBA,4CAAO,GAAP,UAAQ,IAAY;QACnB,IAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,GAAG,IAAI,CAAC;QACb,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE;YAC7B,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;gBAC5B,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;gBACxB,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;aAC/B;SACD;aAAM;YACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;gBACpD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC3B,KAAK,CAAC,KAAM,CAAC,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;aACxB;SACD;IACF,CAAC;IACF,iCAAC;AAAD,CAAC,AArBD,CAAgD,uBAAuB,GAqBtE","sourcesContent":["import { DImagePieceLayouterPart } from \"./d-image-piece-layouter-part\";\n\nexport class DImagePieceLayouterPartTop extends DImagePieceLayouterPart {\n\texecute(ptop: number): void {\n\t\tconst pieces = this._pieces;\n\t\tlet y = ptop;\n\t\tif (this._text !== undefined) {\n\t\t\tlet margin = 0;\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\tpiece.image!.y = margin + y;\n\t\t\t\ty += piece.bound.height;\n\t\t\t\tmargin = piece.margin.vertical;\n\t\t\t}\n\t\t} else {\n\t\t\tfor (let i = 0, imax = pieces.length; i < imax; ++i) {\n\t\t\t\tconst piece = pieces[i];\n\t\t\t\ty += piece.margin.vertical;\n\t\t\t\tpiece.image!.y = y;\n\t\t\t\ty += piece.bound.height;\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
@@ -1,17 +1,31 @@
1
1
  var DImagePieceLayouterPart = /** @class */ (function () {
2
2
  function DImagePieceLayouterPart() {
3
- this.pieces = [];
4
- this.size = 0;
3
+ this._pieces = [];
4
+ this._size = 0;
5
+ this._margin = 0;
5
6
  }
6
7
  DImagePieceLayouterPart.prototype.clear = function () {
7
- this.pieces.length = 0;
8
- this.size = 0;
8
+ this._pieces.length = 0;
9
+ this._size = 0;
10
+ this._margin = 0;
11
+ this._text = undefined;
9
12
  };
10
13
  DImagePieceLayouterPart.prototype.add = function (image, size, margin) {
11
- var pieces = this.pieces;
14
+ var pieces = this._pieces;
12
15
  pieces.push(image);
13
- this.size += margin + size;
16
+ this._size += margin + size;
17
+ this._margin = margin;
14
18
  };
19
+ DImagePieceLayouterPart.prototype.set = function (text) {
20
+ this._text = text;
21
+ };
22
+ Object.defineProperty(DImagePieceLayouterPart.prototype, "size", {
23
+ get: function () {
24
+ return this._size - (this._text === null ? this._margin : 0);
25
+ },
26
+ enumerable: false,
27
+ configurable: true
28
+ });
15
29
  return DImagePieceLayouterPart;
16
30
  }());
17
31
  export { DImagePieceLayouterPart };
@@ -1 +1 @@
1
- {"version":3,"file":"d-image-piece-layouter-part.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part.ts"],"names":[],"mappings":"AAEA;IAIC;QACC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;IACf,CAAC;IAED,uCAAK,GAAL;QACC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;IACf,CAAC;IAED,qCAAG,GAAH,UAAI,KAAkB,EAAE,IAAY,EAAE,MAAc;QACnD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,IAAI,CAAC,IAAI,IAAI,MAAM,GAAG,IAAI,CAAC;IAC5B,CAAC;IACF,8BAAC;AAAD,CAAC,AAnBD,IAmBC","sourcesContent":["import { DImagePiece } from \"./d-image-piece\";\n\nexport class DImagePieceLayouterPart {\n\tpieces: DImagePiece[];\n\tsize: number;\n\n\tconstructor() {\n\t\tthis.pieces = [];\n\t\tthis.size = 0;\n\t}\n\n\tclear(): void {\n\t\tthis.pieces.length = 0;\n\t\tthis.size = 0;\n\t}\n\n\tadd(image: DImagePiece, size: number, margin: number): void {\n\t\tconst pieces = this.pieces;\n\t\tpieces.push(image);\n\t\tthis.size += margin + size;\n\t}\n}\n"]}
1
+ {"version":3,"file":"d-image-piece-layouter-part.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-image-piece-layouter-part.ts"],"names":[],"mappings":"AAGA;IAOC;QACC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,uCAAK,GAAL;QACC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;IACxB,CAAC;IAED,qCAAG,GAAH,UAAI,KAAkB,EAAE,IAAY,EAAE,MAAc;QACnD,IAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,IAAI,CAAC,KAAK,IAAI,MAAM,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,qCAAG,GAAH,UAAI,IAAyB;QAC5B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,sBAAI,yCAAI;aAAR;YACC,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,CAAC;;;OAAA;IACF,8BAAC;AAAD,CAAC,AAlCD,IAkCC","sourcesContent":["import { DDynamicText } from \"./d-dynamic-text\";\nimport { DImagePiece } from \"./d-image-piece\";\n\nexport class DImagePieceLayouterPart {\n\tprotected _pieces: DImagePiece[];\n\tprotected _size: number;\n\tprotected _margin: number;\n\n\tprotected _text?: DDynamicText | null;\n\n\tconstructor() {\n\t\tthis._pieces = [];\n\t\tthis._size = 0;\n\t\tthis._margin = 0;\n\t}\n\n\tclear(): void {\n\t\tthis._pieces.length = 0;\n\t\tthis._size = 0;\n\t\tthis._margin = 0;\n\t\tthis._text = undefined;\n\t}\n\n\tadd(image: DImagePiece, size: number, margin: number): void {\n\t\tconst pieces = this._pieces;\n\t\tpieces.push(image);\n\t\tthis._size += margin + size;\n\t\tthis._margin = margin;\n\t}\n\n\tset(text: DDynamicText | null): void {\n\t\tthis._text = text;\n\t}\n\n\tget size(): number {\n\t\treturn this._size - (this._text === null ? this._margin : 0);\n\t}\n}\n"]}
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.161.0
2
+ Winter Cardinal UI v0.162.0
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.161.0
2
+ Winter Cardinal UI v0.162.0
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.161.0
2
+ Winter Cardinal UI v0.162.0
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.161.0
2
+ Winter Cardinal UI v0.162.0
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5