@flashist/appframework 0.0.329 → 0.0.331

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 (15) hide show
  1. package/display/views/button/SimpleButtonConfig.d.ts +22 -15
  2. package/display/views/button/SimpleButtonConfig.js +20 -36
  3. package/display/views/button/SimpleButtonConfig.js.map +1 -1
  4. package/display/views/button/SimpleButtonView.d.ts +4 -3
  5. package/display/views/button/SimpleButtonView.js +94 -19
  6. package/display/views/button/SimpleButtonView.js.map +1 -1
  7. package/display/views/layout/AlignWithMaxSizeLayout.js +1 -1
  8. package/display/views/layout/AlignWithMaxSizeLayout.js.map +1 -1
  9. package/display/views/layout/ColumnLayout.js +2 -2
  10. package/display/views/layout/ColumnLayout.js.map +1 -1
  11. package/display/views/layout/MultiColumnLayout.js +1 -1
  12. package/display/views/layout/MultiColumnLayout.js.map +1 -1
  13. package/display/views/layout/RowLayout.js +2 -2
  14. package/display/views/layout/RowLayout.js.map +1 -1
  15. package/package.json +1 -1
package/display/views/button/SimpleButtonConfig.d.ts CHANGED
@@ -1,30 +1,37 @@
1
1
  import { DisplayObjectContainer, IFLabelConfig } from "@flashist/flibs";
2
2
  import { SimpleButtonState } from "./SimpleButtonState";
3
3
  export declare const SimpleButtonDefaultConfig: {
4
- labelConfig: IFLabelConfig;
5
- bgConfig: Partial<ISimpleButtonBgConfig>;
4
+ defaultState: ISingleButtonSingleStateConfig;
6
5
  states: ISimpleButtonStatesConfig;
7
6
  };
7
+ export interface ISimpleButtonIconConfig {
8
+ textureId?: string;
9
+ maxWidth?: number;
10
+ scaleByWidth?: boolean;
11
+ maxHeight: number;
12
+ scaleByHeight?: boolean;
13
+ alpha?: number;
14
+ }
8
15
  export interface ISimpleButtonBgConfig {
9
- bgAlpha: number;
10
- bgColor: number;
11
- bgLineWidth: number;
12
- bgLineColor: number;
13
- bgLineAlpha: number;
14
- bgCornerRadius: number;
15
- contentToBgPaddingX: number;
16
- contentToBgPaddingY: number;
17
- contentToBgShiftX: number;
18
- contentToBgShiftY: number;
16
+ bgAlpha?: number;
17
+ bgColor?: number;
18
+ bgLineWidth?: number;
19
+ bgLineColor?: number;
20
+ bgLineAlpha?: number;
21
+ bgCornerRadius?: number;
22
+ contentToBgPaddingX?: number;
23
+ contentToBgPaddingY?: number;
24
+ contentToBgShiftX?: number;
25
+ contentToBgShiftY?: number;
19
26
  }
20
- export interface ISingleButtonStateConfig {
27
+ export interface ISingleButtonSingleStateConfig {
21
28
  alpha?: number;
22
- icon?: string;
29
+ iconConfig?: ISimpleButtonIconConfig;
23
30
  labelConfig?: IFLabelConfig;
24
31
  bgConfig?: Partial<ISimpleButtonBgConfig>;
25
32
  externalView?: DisplayObjectContainer;
26
33
  }
27
34
  export type ISimpleButtonStatesConfig = {
28
- [key in SimpleButtonState]?: ISingleButtonStateConfig;
35
+ [key in SimpleButtonState]?: ISingleButtonSingleStateConfig;
29
36
  };
30
37
  export type SimpleButtonConfig = Partial<typeof SimpleButtonDefaultConfig>;
package/display/views/button/SimpleButtonConfig.js CHANGED
@@ -1,23 +1,24 @@
1
1
  export const SimpleButtonDefaultConfig = {
2
- // We need this param in both states and root,
3
- // because we need a correct label config
4
- // at the moment of creationg of the FLabel instance
5
- // labelConfig: null as IFLabelConfig,
6
- labelConfig: {
7
- autosize: true
8
- },
9
- bgConfig: {
10
- // 0.001 to make sure the bg is drawn, but is almost invisible
11
- bgAlpha: 0.001,
12
- bgColor: 0x000000,
13
- bgLineWidth: 0,
14
- bgLineColor: 0x000000,
15
- bgLineAlpha: 0,
16
- bgCornerRadius: 0,
17
- contentToBgPaddingX: 0,
18
- contentToBgPaddingY: 0,
19
- contentToBgShiftX: 0,
20
- contentToBgShiftY: 0
2
+ defaultState: {
3
+ labelConfig: {
4
+ autosize: true
5
+ },
6
+ icon: {
7
+ // none by default
8
+ },
9
+ bgConfig: {
10
+ // 0.001 to make sure the bg is drawn, but is almost invisible
11
+ bgAlpha: 0.001,
12
+ bgColor: 0x000000,
13
+ bgLineWidth: 0,
14
+ bgLineColor: 0x000000,
15
+ bgLineAlpha: 0,
16
+ bgCornerRadius: 0,
17
+ contentToBgPaddingX: 0,
18
+ contentToBgPaddingY: 0,
19
+ contentToBgShiftX: 0,
20
+ contentToBgShiftY: 0
21
+ }
21
22
  },
22
23
  states: {
23
24
  normal: {
@@ -34,21 +35,4 @@ export const SimpleButtonDefaultConfig = {
34
35
  }
35
36
  }
36
37
  };
37
- // export interface ISimpleButtonConfig {
38
- // // bgConfig?: {
39
- // // image?: {
40
- // // imageId: string;
41
- // // };
42
- // // vector?: {
43
- // // bgColor: number;
44
- // // overBgColor: number;
45
- // // bgAlpha: number;
46
- // // bgBorderColor: number;
47
- // // bgBorderAlpha: number;
48
- // // bgBorderWidth: number;
49
- // // }
50
- // // resizeBg?: boolean;
51
- // // };
52
- // labelConfig?: IFLabelConfig;
53
- // }
54
38
  //# sourceMappingURL=SimpleButtonConfig.js.map
package/display/views/button/SimpleButtonConfig.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SimpleButtonConfig.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonConfig.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACrC,8CAA8C;IAC9C,yCAAyC;IACzC,oDAAoD;IACpD,sCAAsC;IACtC,WAAW,EAAE;QACT,QAAQ,EAAE,IAAI;KACA;IAElB,QAAQ,EAAE;QACN,8DAA8D;QAC9D,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,QAAQ;QACjB,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,QAAQ;QACrB,WAAW,EAAE,CAAC;QACd,cAAc,EAAE,CAAC;QACjB,mBAAmB,EAAE,CAAC;QACtB,mBAAmB,EAAE,CAAC;QACtB,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,CAAC;KACW;IAEnC,MAAM,EAAE;QACJ,MAAM,EAAE;YACJ,KAAK,EAAE,IAAI;SACc;QAC7B,IAAI,EAAE;YACF,KAAK,EAAE,CAAC;SACiB;QAC7B,KAAK,EAAE;YACH,KAAK,EAAE,CAAC;SACiB;QAC7B,QAAQ,EAAE;YACN,KAAK,EAAE,GAAG;SACe;KACH;CACjC,CAAA;AA+BD,yCAAyC;AACzC,sBAAsB;AACtB,uBAAuB;AACvB,kCAAkC;AAClC,gBAAgB;AAEhB,wBAAwB;AACxB,kCAAkC;AAClC,sCAAsC;AACtC,kCAAkC;AAClC,wCAAwC;AACxC,wCAAwC;AACxC,wCAAwC;AACxC,eAAe;AAEf,iCAAiC;AACjC,YAAY;AAEZ,mCAAmC;AACnC,IAAI"}
1
+ {"version":3,"file":"SimpleButtonConfig.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonConfig.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,yBAAyB,GAAG;IAErC,YAAY,EAAE;QACV,WAAW,EAAE;YACT,QAAQ,EAAE,IAAI;SACA;QAElB,IAAI,EAAE;QACF,kBAAkB;SACM;QAE5B,QAAQ,EAAE;YACN,8DAA8D;YAC9D,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,QAAQ;YACjB,WAAW,EAAE,CAAC;YACd,WAAW,EAAE,QAAQ;YACrB,WAAW,EAAE,CAAC;YACd,cAAc,EAAE,CAAC;YACjB,mBAAmB,EAAE,CAAC;YACtB,mBAAmB,EAAE,CAAC;YACtB,iBAAiB,EAAE,CAAC;YACpB,iBAAiB,EAAE,CAAC;SACvB;KAC8B;IAEnC,MAAM,EAAE;QACJ,MAAM,EAAE;YACJ,KAAK,EAAE,IAAI;SACoB;QACnC,IAAI,EAAE;YACF,KAAK,EAAE,CAAC;SACuB;QACnC,KAAK,EAAE;YACH,KAAK,EAAE,CAAC;SACuB;QACnC,QAAQ,EAAE;YACN,KAAK,EAAE,GAAG;SACqB;KACT;CACjC,CAAA"}
package/display/views/button/SimpleButtonView.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { FContainer, FLabel, Sprite, Graphics, DisplayObjectContainer } from "@flashist/flibs";
2
- import { SimpleButtonConfig, ISingleButtonStateConfig, ISimpleButtonBgConfig } from "./SimpleButtonConfig";
2
+ import { SimpleButtonConfig, ISingleButtonSingleStateConfig } from "./SimpleButtonConfig";
3
3
  import { AppResizableContainer } from "../resize/AppResizableContainer";
4
4
  import { IToggableItem } from "../togglegroup/IToggableItem";
5
5
  import { BaseLayout, BaseLayoutableContainer } from "../../../index";
@@ -28,6 +28,7 @@ export declare class SimpleButtonView<DataType extends object = object> extends
28
28
  protected onDown(): void;
29
29
  protected onUp(): void;
30
30
  protected onTap(): void;
31
+ protected updateIcon(): void;
31
32
  protected arrange(): void;
32
33
  get enabled(): boolean;
33
34
  set enabled(value: boolean);
@@ -36,13 +37,13 @@ export declare class SimpleButtonView<DataType extends object = object> extends
36
37
  get state(): string;
37
38
  set state(value: string);
38
39
  protected getCurrentActiveState(): string;
39
- protected getCurrentActiveStateConfig(): ISingleButtonStateConfig;
40
+ protected getCurrentActiveStateConfig(): ISingleButtonSingleStateConfig;
41
+ protected getCurrentActiveCombinedStateConfig(): ISingleButtonSingleStateConfig;
40
42
  protected commitData(): void;
41
43
  get selected(): boolean;
42
44
  set selected(value: boolean);
43
45
  protected findStateValue(normalState: string): string;
44
46
  addExternalView(view: DisplayObjectContainer, addAtIndex?: number): void;
45
- protected getCurActiveCombinedBgConfig(): Partial<ISimpleButtonBgConfig>;
46
47
  protected get bgCalculatedWidth(): number;
47
48
  protected get bgCalculatedHeight(): number;
48
49
  protected updateBg(): void;
package/display/views/button/SimpleButtonView.js CHANGED
@@ -18,8 +18,18 @@ export class SimpleButtonView extends AppResizableContainer {
18
18
  this.config = ObjectTools.clone(SimpleButtonDefaultConfig);
19
19
  // Make sure we don't try to deep-copy some "complex" type properties
20
20
  const linkCopyConfig = {
21
+ defaultState: {},
21
22
  states: {}
22
23
  };
24
+ if (config.defaultState) {
25
+ if (config.defaultState.externalView) {
26
+ // Save the "complex" type data, to be able to use it later
27
+ linkCopyConfig.defaultState.externalView = config.defaultState.externalView;
28
+ // Temporarily remove the "complex" type data from the config
29
+ // to correctly apply deep-copy algorythm
30
+ delete config.defaultState.externalView;
31
+ }
32
+ }
23
33
  if (config.states) {
24
34
  const configStateIds = Object.keys(config.states);
25
35
  for (let singleStateId of configStateIds) {
@@ -36,6 +46,12 @@ export class SimpleButtonView extends AppResizableContainer {
36
46
  }
37
47
  // Then override them with passed config
38
48
  ObjectTools.copyProps(this.config, config);
49
+ if (config.defaultState) {
50
+ // Set the link-based data of the "complex" link
51
+ this.config.defaultState.externalView = linkCopyConfig.defaultState.externalView;
52
+ // Return the data into the original config
53
+ config.defaultState.externalView = linkCopyConfig.defaultState.externalView;
54
+ }
39
55
  if (config.states) {
40
56
  // Return back all the deleted "complex" type properties to the original config
41
57
  // And use them in the final config
@@ -67,7 +83,7 @@ export class SimpleButtonView extends AppResizableContainer {
67
83
  // this.contentCont.addChild(this.viewCont);
68
84
  this.layoutableCont = new BaseLayoutableContainer();
69
85
  this.contentCont.addChild(this.layoutableCont);
70
- this.fLabel = new FLabel(this.config.labelConfig);
86
+ this.fLabel = new FLabel(this.config.defaultState.labelConfig);
71
87
  this.layoutableCont.addChild(this.fLabel);
72
88
  //
73
89
  this.fLabel.text = "";
@@ -114,8 +130,34 @@ export class SimpleButtonView extends AppResizableContainer {
114
130
  onTap() {
115
131
  this.onOut();
116
132
  }
133
+ updateIcon() {
134
+ let tempStateConfig = this.getCurrentActiveCombinedStateConfig();
135
+ this.icon.texture = null;
136
+ //
137
+ if (tempStateConfig.iconConfig) {
138
+ this.icon.texture = Texture.from(tempStateConfig.iconConfig.textureId);
139
+ // Reset possible prev transformations
140
+ this.icon.scale.x = 1;
141
+ this.icon.scale.y = 1;
142
+ //
143
+ if (tempStateConfig.iconConfig.maxWidth) {
144
+ this.icon.width = Math.max(this.icon.width, tempStateConfig.iconConfig.maxWidth);
145
+ }
146
+ if (tempStateConfig.iconConfig.maxHeight) {
147
+ this.icon.height = Math.max(this.icon.height, tempStateConfig.iconConfig.maxHeight);
148
+ }
149
+ //
150
+ if (tempStateConfig.iconConfig.scaleByWidth) {
151
+ this.icon.scale.y = this.icon.scale.x;
152
+ }
153
+ if (tempStateConfig.iconConfig.scaleByHeight) {
154
+ this.icon.scale.x = this.icon.scale.y;
155
+ }
156
+ }
157
+ }
117
158
  arrange() {
118
159
  super.arrange();
160
+ this.updateIcon();
119
161
  if (this.contentLayout) {
120
162
  this.contentLayout.arrange(this.layoutableCont);
121
163
  }
@@ -180,15 +222,57 @@ export class SimpleButtonView extends AppResizableContainer {
180
222
  let result = this.config.states[tempState];
181
223
  return result;
182
224
  }
225
+ getCurrentActiveCombinedStateConfig() {
226
+ let result = {};
227
+ // Make sure we don't try to deep-copy some "complex" type properties
228
+ const linkCopyConfig = {};
229
+ let curActiveStateConfig = this.getCurrentActiveStateConfig();
230
+ if (curActiveStateConfig.externalView) {
231
+ // Save the "complex" type data, to be able to use it later
232
+ linkCopyConfig.externalView = curActiveStateConfig.externalView;
233
+ // Temporarily remove the "complex" type data from the config
234
+ // to correctly apply deep-copy algorythm
235
+ delete curActiveStateConfig.externalView;
236
+ }
237
+ // Then override them with passed config
238
+ ObjectTools.copyProps(result, curActiveStateConfig);
239
+ if (linkCopyConfig.externalView) {
240
+ // Return the data into the original config
241
+ curActiveStateConfig.externalView = linkCopyConfig.externalView;
242
+ }
243
+ return result;
244
+ }
245
+ // protected getCurActiveCombinedBgConfig(): Partial<ISimpleButtonBgConfig> {
246
+ // let result: Partial<ISimpleButtonBgConfig> = {};
247
+ // if (this.config.bgConfig) {
248
+ // ObjectTools.copyProps(result, this.config.bgConfig);
249
+ // }
250
+ // let tempStateConfig: ISingleButtonStateConfig = this.getCurrentActiveStateConfig();
251
+ // if (tempStateConfig.bgConfig) {
252
+ // ObjectTools.copyProps(result, tempStateConfig.bgConfig);
253
+ // }
254
+ // return result;
255
+ // }
256
+ // protected getCurActiveCombinedIconConfig(): Partial<ISimpleButtonBgConfig> {
257
+ // let result: Partial<ISimpleButtonBgConfig> = {};
258
+ // if (this.config.bgConfig) {
259
+ // ObjectTools.copyProps(result, this.config.bgConfig);
260
+ // }
261
+ // let tempStateConfig: ISingleButtonStateConfig = this.getCurrentActiveStateConfig();
262
+ // if (tempStateConfig.bgConfig) {
263
+ // ObjectTools.copyProps(result, tempStateConfig.bgConfig);
264
+ // }
265
+ // return result;
266
+ // }
183
267
  commitData() {
184
268
  super.commitData();
185
269
  let tempConfig = this.getCurrentActiveStateConfig();
186
270
  if (tempConfig.alpha || tempConfig.alpha === 0) {
187
271
  this.alpha = tempConfig.alpha;
188
272
  }
189
- if (tempConfig.icon) {
190
- this.icon.texture = Texture.from(tempConfig.icon);
191
- }
273
+ // if (tempConfig.iconConfig) {
274
+ // this.icon.texture = Texture.from(tempConfig.icon);
275
+ // }
192
276
  if (tempConfig.labelConfig) {
193
277
  this.fLabel.changeConfig(tempConfig.labelConfig);
194
278
  }
@@ -240,17 +324,6 @@ export class SimpleButtonView extends AppResizableContainer {
240
324
  }
241
325
  this.arrange();
242
326
  }
243
- getCurActiveCombinedBgConfig() {
244
- let result = {};
245
- if (this.config.bgConfig) {
246
- ObjectTools.copyProps(result, this.config.bgConfig);
247
- }
248
- let tempStateConfig = this.getCurrentActiveStateConfig();
249
- if (tempStateConfig.bgConfig) {
250
- ObjectTools.copyProps(result, tempStateConfig.bgConfig);
251
- }
252
- return result;
253
- }
254
327
  get bgCalculatedWidth() {
255
328
  return this.resizeSize.x || this.contentCont.width;
256
329
  }
@@ -258,13 +331,15 @@ export class SimpleButtonView extends AppResizableContainer {
258
331
  return this.resizeSize.y || this.contentCont.height;
259
332
  }
260
333
  updateBg() {
261
- let tempBgConfig = this.getCurActiveCombinedBgConfig();
334
+ let tempStateConfig = this.getCurrentActiveCombinedStateConfig();
262
335
  this.bg.clear();
263
336
  //
264
337
  // this.bg.rect(0, 0, this.bgCalculatedWidth, this.bgCalculatedHeight);
265
- this.bg.roundRect(0, 0, this.bgCalculatedWidth, this.bgCalculatedHeight, tempBgConfig.bgCornerRadius);
266
- this.bg.fill({ color: tempBgConfig.bgColor, alpha: tempBgConfig.bgAlpha });
267
- this.bg.stroke({ color: tempBgConfig.bgLineColor, alpha: tempBgConfig.bgLineAlpha, width: tempBgConfig.bgLineWidth, alignment: 1 });
338
+ if (tempStateConfig.bgConfig) {
339
+ this.bg.roundRect(0, 0, this.bgCalculatedWidth, this.bgCalculatedHeight, tempStateConfig.bgConfig.bgCornerRadius);
340
+ this.bg.fill({ color: tempStateConfig.bgConfig.bgColor, alpha: tempStateConfig.bgConfig.bgAlpha });
341
+ this.bg.stroke({ color: tempStateConfig.bgConfig.bgLineColor, alpha: tempStateConfig.bgConfig.bgLineAlpha, width: tempStateConfig.bgConfig.bgLineWidth, alignment: 1 });
342
+ }
268
343
  }
269
344
  // OLD
270
345
  // protected updateBg(): void {
package/display/views/button/SimpleButtonView.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SimpleButtonView.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAA0B,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE5J,OAAO,EAAgD,yBAAyB,EAAyB,MAAM,sBAAsB,CAAC;AACtI,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAc,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAErE,MAAM,OAAO,gBAAmD,SAAQ,qBAA+B;IA6CnG,IAAW,IAAI;QACX,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAQD,YAAY,MAA0B;QAClC,KAAK,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;IAES,YAAY,CAAC,MAA0B;;QAC7C,KAAK,CAAC,YAAY,EAAE,CAAC;QACrB,+BAA+B;QAC/B,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAE3D,qEAAqE;QACrE,MAAM,cAAc,GAAuB;YACvC,MAAM,EAAE,EAAE;SACb,CAAC;QAEF,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,cAAc,GAAa,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC5D,KAAK,IAAI,aAAa,IAAI,cAAc,EAAE,CAAC;gBACvC,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,YAAY,EAAE,CAAC;oBAC5C,2DAA2D;oBAC3D,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG;wBACnC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,YAAY;qBAC1D,CAAC;oBAEF,6DAA6D;oBAC7D,yCAAyC;oBACzC,OAAO,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,YAAY,CAAC;gBACrD,CAAC;YACL,CAAC;QACL,CAAC;QAED,wCAAwC;QACxC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE3C,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAChB,+EAA+E;YAC/E,mCAAmC;YACnC,MAAM,sBAAsB,GAAa,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACpE,KAAK,IAAI,iBAAiB,IAAI,sBAAsB,EAAE,CAAC;gBACnD,IAAI,MAAA,cAAc,CAAC,MAAM,CAAC,iBAAiB,CAAC,0CAAE,YAAY,EAAE,CAAC;oBACzD,gDAAgD;oBAChD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,YAAY,CAAC;oBAC3G,2CAA2C;oBAC3C,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,YAAY,CAAC;gBAC1G,CAAC;YACL,CAAC;QACL,CAAC;QAED,qBAAqB;QACrB,4BAA4B;QAC5B,yBAAyB;QACzB,gCAAgC;QAChC,yBAAyB;QACzB,4BAA4B;QAC5B,iCAAiC;QACjC,iCAAiC;QACjC,6BAA6B;QAC7B,sCAAsC;QAEtC,IAAI,CAAC,EAAE,GAAG,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEvB,IAAI,CAAC,WAAW,GAAG,IAAI,UAAU,EAAE,CAAC;QACpC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEhC,oCAAoC;QACpC,4CAA4C;QAE5C,IAAI,CAAC,cAAc,GAAG,IAAI,uBAAuB,EAAE,CAAC;QACpD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAE/C,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1C,EAAE;QACF,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;QACtB,EAAE;QACF,kCAAkC;QAClC,0CAA0C;QAE1C,IAAI,CAAC,KAAK,GAAG,IAAI,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExC,IAAI,CAAC,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC;QACtC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,yCAAyC;QACzC,mBAAmB;QACnB,yBAAyB;QACzB,yBAAyB;QACzB,SAAS;QACT,IAAI;IACR,CAAC;IAES,YAAY;QAClB,KAAK,CAAC,YAAY,EAAE,CAAC;QAErB,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CACrC,IAAI,EACJ,gBAAgB,CAAC,IAAI,EACrB,IAAI,CAAC,MAAM,CACd,CAAC;QACF,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CACrC,IAAI,EACJ,gBAAgB,CAAC,GAAG,EACpB,IAAI,CAAC,KAAK,CACb,CAAC;QACF,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CACrC,IAAI,EACJ,gBAAgB,CAAC,IAAI,EACrB,IAAI,CAAC,MAAM,CACd,CAAC;QACF,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CACrC,IAAI,EACJ,gBAAgB,CAAC,EAAE,EACnB,IAAI,CAAC,IAAI,CACZ,CAAC;QACF,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CACrC,IAAI,EACJ,gBAAgB,CAAC,GAAG,EACpB,IAAI,CAAC,KAAK,CACb,CAAC;QACF,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CACrC,IAAI,EACJ,gBAAgB,CAAC,UAAU,EAC3B,IAAI,CAAC,WAAW,CACnB,CAAC;IACN,CAAC;IAES,WAAW;QACjB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC/D,CAAC;IAES,MAAM;QACZ,8BAA8B;QAC9B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAES,KAAK;QACX,iCAAiC;QACjC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC/D,CAAC;IAES,MAAM;QACZ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAC9D,CAAC;IAES,IAAI;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAES,KAAK;QACX,IAAI,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;IAES,OAAO;QACb,KAAK,CAAC,OAAO,EAAE,CAAC;QAEhB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,SAAS,GAAW,kBAAkB,CAAC,QAAQ,CACjD,IAAI,CAAC,WAAW,CAAC,KAAK,EACtB,IAAI,CAAC,WAAW,CAAC,MAAM,EACvB,IAAI,CAAC,UAAU,CAAC,CAAC,EACjB,IAAI,CAAC,UAAU,CAAC,CAAC,CACpB,CAAC;YACF,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC;QAGD,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,yIAAyI;QACzI,2IAA2I;QAE3I,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACnG,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACzG,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACD,IAAI,OAAO,CAAC,KAAc;QACtB,IAAI,KAAK,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,OAAO;QACX,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QAEtB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC/D,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAED,IAAW,IAAI;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC5B,CAAC;IACD,IAAW,IAAI,CAAC,KAAa;QACzB,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,IAAW,KAAK;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAW,KAAK,CAAC,KAAa;QAC1B,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACtB,OAAO;QACX,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QAEpB,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,qBAAqB;QAC3B,IAAI,MAAM,GAAW,IAAI,CAAC,KAAK,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChB,MAAM,GAAG,gBAAgB,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjE,CAAC;QACL,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC;QACtC,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,2BAA2B;QACjC,IAAI,SAAS,GAAW,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAErD,IAAI,MAAM,GAA6B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACrE,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,UAAU;QAChB,KAAK,CAAC,UAAU,EAAE,CAAC;QAEnB,IAAI,UAAU,GAA6B,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAE9E,IAAI,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;QAClC,CAAC;QAED,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,UAAU,CAAC,YAAY,KAAK,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACxD,YAAY,CAAC,2BAA2B,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,UAAU,CAAC,YAAY,EAAE,CAAC;YAC1B,yDAAyD;YACzD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QAE5B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;YACzB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACvB,CAAC;QAED,mBAAmB;QACnB,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IACD,IAAW,QAAQ,CAAC,KAAc;QAC9B,IAAI,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACzB,OAAO;QACX,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QAEvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC/D,CAAC;IAES,cAAc,CAAC,WAAmB;QACxC,IAAI,MAAc,CAAC;QAEnB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,MAAM,GAAG,gBAAgB,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,GAAG,WAAW,CAAC;QACzB,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,eAAe,CAAC,IAA4B,EAAE,UAAmB;QACpE,gCAAgC;QAChC,IAAI,UAAU,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAES,4BAA4B;QAClC,IAAI,MAAM,GAAmC,EAAE,CAAC;QAEhD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACvB,WAAW,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,eAAe,GAA6B,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACnF,IAAI,eAAe,CAAC,QAAQ,EAAE,CAAC;YAC3B,WAAW,CAAC,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,IAAc,iBAAiB;QAC3B,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IACvD,CAAC;IAED,IAAc,kBAAkB;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;IACxD,CAAC;IAES,QAAQ;QACd,IAAI,YAAY,GAAmC,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAEvF,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAChB,EAAE;QACF,uEAAuE;QACvE,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;QACtG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,WAAW,EAAE,KAAK,EAAE,YAAY,CAAC,WAAW,EAAE,KAAK,EAAE,YAAY,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAA;IACvI,CAAC;IAED,MAAM;IACN,+BAA+B;IAC/B,sEAAsE;IACtE,cAAc;IAEd,uBAAuB;IAEvB,mNAAmN;IACnN,2KAA2K;IAC3K,kGAAkG;IAElG,4BAA4B;IAC5B,IAAI;IAGJ,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACD,IAAW,aAAa,CAAC,KAAiB;QACtC,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAE5B,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;;AA5aa,uCAAsB,GAAG,CAAC,GAAQ,EAAE;IAC9C,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,iBAAiB,CAAC,eAAe,CAAC;IACrE,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,aAAa,CAAC;IACjE,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,iBAAiB,CAAC,cAAc,CAAC;IACnE,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,iBAAiB,CAAC,iBAAiB,CAAC;IAEzE,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC,EAAE,CAAC;AAES,uCAAsB,GAAG,CAAC,GAAQ,EAAE;IAC9C,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,MAAM,CAAC,iBAAiB,CAAC,eAAe,CAAC,GAAG,iBAAiB,CAAC,MAAM,CAAC;IACrE,MAAM,CAAC,iBAAiB,CAAC,aAAa,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC;IACjE,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC;IACnE,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,iBAAiB,CAAC,QAAQ,CAAC;IAEzE,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC,EAAE,CAAC"}
1
+ {"version":3,"file":"SimpleButtonView.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonView.ts"],"names":[],"mappings":"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"}
package/display/views/layout/AlignWithMaxSizeLayout.js CHANGED
@@ -15,7 +15,7 @@ export class AlignWithMaxSizeLayout extends BaseLayout {
15
15
  //
16
16
  let childrenCount = container.layoutGetChildrenNum();
17
17
  for (let childIndex = 0; childIndex < childrenCount; childIndex++) {
18
- tempChild = container.layoutGetChildAt(childIndex);
18
+ tempChild = this.getChildAt(container, childIndex);
19
19
  tempChildSize = GetSizeTools.getObjectSize(tempChild);
20
20
  this.arrangeChild(tempChild, prevChild, this.settings.align, this.settings.valign, childMaxSize, 0, 0);
21
21
  prevChild = tempChild;
package/display/views/layout/AlignWithMaxSizeLayout.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AlignWithMaxSizeLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/AlignWithMaxSizeLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,MAAM,OAAO,sBAAuB,SAAQ,UAAU;IAE3C,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,kCAAkC,EAAE,gCAAgC,CAAC,CAAC;YACjF,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAoB,CAAC;QAEzB,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,SAA2B,CAAC;QAChC,EAAE;QACF,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,SAAS,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;YAEnD,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAEtD,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAEvG,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAES,6BAA6B,CAAC,SAA+B,EAAE,YAAoB,EAAE,SAAiB;QAC5G,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,MAAM,GAAU,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;QAE9D,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,2BAA2B,CAAC,SAA+B;QAC9D,IAAI,MAAM,GAAU,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
1
+ {"version":3,"file":"AlignWithMaxSizeLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/AlignWithMaxSizeLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,MAAM,OAAO,sBAAuB,SAAQ,UAAU;IAE3C,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,kCAAkC,EAAE,gCAAgC,CAAC,CAAC;YACjF,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAoB,CAAC;QAEzB,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,SAA2B,CAAC;QAChC,EAAE;QACF,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAEnD,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAEtD,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAEvG,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAES,6BAA6B,CAAC,SAA+B,EAAE,YAAoB,EAAE,SAAiB;QAC5G,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,MAAM,GAAU,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;QAE9D,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,2BAA2B,CAAC,SAA+B;QAC9D,IAAI,MAAM,GAAU,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
package/display/views/layout/ColumnLayout.js CHANGED
@@ -27,7 +27,7 @@ export class ColumnLayout extends BaseLayout {
27
27
  //
28
28
  var childrenCount = container.layoutGetChildrenNum();
29
29
  for (var childIndex = 0; childIndex < childrenCount; childIndex++) {
30
- tempChild = container.layoutGetChildAt(childIndex);
30
+ tempChild = this.getChildAt(container, childIndex);
31
31
  tempChildSize = GetSizeTools.getObjectSize(tempChild);
32
32
  this.arrangeChild(tempChild, prevChild, this.settings.align, this.settings.valign, childMaxSize, 0, childIndex);
33
33
  // Запоминаем данные о текущем элементе
@@ -68,7 +68,7 @@ export class ColumnLayout extends BaseLayout {
68
68
  // не на основе максимального размера, а на положения и размера последнего элемента
69
69
  var childrenCount = container.layoutGetChildrenNum();
70
70
  if (childrenCount > 0) {
71
- var lastChild = container.layoutGetChildAt(childrenCount - 1);
71
+ var lastChild = this.getChildAt(container, childrenCount - 1);
72
72
  if (lastChild) {
73
73
  var lastChildSize = GetSizeTools.getObjectSize(lastChild);
74
74
  this._totalSize.y = lastChild.y + lastChildSize.y + this.settings.paddingY;
package/display/views/layout/ColumnLayout.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ColumnLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/ColumnLayout.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ColumnLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/ColumnLayout.ts"],"names":[],"mappings":"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"}
package/display/views/layout/MultiColumnLayout.js CHANGED
@@ -19,7 +19,7 @@ export class MultiColumnLayout extends BaseLayout {
19
19
  var prevChild;
20
20
  var childrenCount = container.layoutGetChildrenNum();
21
21
  for (var childIndex = 0; childIndex < childrenCount; childIndex++) {
22
- tempChild = container.layoutGetChildAt(childIndex);
22
+ tempChild = this.getChildAt(container, childIndex);
23
23
  let colIndex = childIndex % this.settings.columnsCount;
24
24
  let rowIndex = Math.floor(childIndex / this.settings.columnsCount);
25
25
  this.arrangeChild(tempChild, prevChild, this.settings.align, this.settings.valign, childMaxSize, colIndex, rowIndex);
package/display/views/layout/MultiColumnLayout.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MultiColumnLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/MultiColumnLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,UAAU;IAI7C,YAAY,QAA0C;QAClD,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAEM,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,gCAAgC,CAAC,CAAC;YACvE,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,SAAS,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;YAEnD,IAAI,QAAQ,GAAW,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC/D,IAAI,QAAQ,GAAW,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAE3E,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAErH,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QAGD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAEM,2BAA2B,CAAC,SAA+B;QAC9D,IAAI,MAAM,GAAU,IAAI,KAAK,EAAE,CAAC;QAEhC,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QACtC,MAAM,CAAC,CAAC,GAAG,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QAEtD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
1
+ {"version":3,"file":"MultiColumnLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/MultiColumnLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,UAAU;IAI7C,YAAY,QAA0C;QAClD,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAEM,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,gCAAgC,CAAC,CAAC;YACvE,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAEnD,IAAI,QAAQ,GAAW,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC/D,IAAI,QAAQ,GAAW,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAE3E,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAErH,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QAGD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAEM,2BAA2B,CAAC,SAA+B;QAC9D,IAAI,MAAM,GAAU,IAAI,KAAK,EAAE,CAAC;QAEhC,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QACtC,MAAM,CAAC,CAAC,GAAG,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QAEtD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
package/display/views/layout/RowLayout.js CHANGED
@@ -23,7 +23,7 @@ export class RowLayout extends BaseLayout {
23
23
  //
24
24
  var childrenCount = container.layoutGetChildrenNum();
25
25
  for (var childIndex = 0; childIndex < childrenCount; childIndex++) {
26
- tempChild = container.layoutGetChildAt(childIndex);
26
+ tempChild = this.getChildAt(container, childIndex);
27
27
  tempChildSize = GetSizeTools.getObjectSize(tempChild);
28
28
  this.arrangeChild(tempChild, prevChild, this.settings.align, this.settings.valign, childMaxSize, childIndex);
29
29
  // Запоминаем данные о текущем элементе
@@ -64,7 +64,7 @@ export class RowLayout extends BaseLayout {
64
64
  // не на основе максимального размера, а на положения и размера последнего элемента
65
65
  var childrenCount = container.layoutGetChildrenNum();
66
66
  if (childrenCount > 0) {
67
- var lastChild = container.layoutGetChildAt(childrenCount - 1);
67
+ var lastChild = this.getChildAt(container, childrenCount - 1);
68
68
  if (lastChild) {
69
69
  var lastChildSize = GetSizeTools.getObjectSize(lastChild);
70
70
  this._totalSize.x = lastChild.x + lastChildSize.x + this.settings.paddingX;
package/display/views/layout/RowLayout.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RowLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/RowLayout.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RowLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/RowLayout.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flashist/appframework",
3
- "version": "0.0.329",
3
+ "version": "0.0.331",
4
4
  "scripts": {
5
5
  "build": "gulp",
6
6
  "publish:patch": "npm version patch && npm run build && cd ./dist && npm publish",