@flashist/appframework 0.0.328 → 0.0.329
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.
- package/display/views/layout/BaseLayout.d.ts +1 -0
- package/display/views/layout/BaseLayout.js +7 -1
- package/display/views/layout/BaseLayout.js.map +1 -1
- package/display/views/layout/LayoutConfig.d.ts +1 -0
- package/display/views/layout/LayoutConfig.js +1 -0
- package/display/views/layout/LayoutConfig.js.map +1 -1
- package/package.json +1 -1
|
@@ -12,6 +12,7 @@ export declare abstract class BaseLayout {
|
|
|
12
12
|
constructor(settings?: Partial<LayoutConfig>);
|
|
13
13
|
abstract arrange(container: ILayoutableContainer): void;
|
|
14
14
|
getMaxChildSize(container: ILayoutableContainer): Point;
|
|
15
|
+
protected getChildAt(container: ILayoutableContainer, childIndex: number): ILayoutableChild;
|
|
15
16
|
protected arrangeChild(child: ILayoutableChild, prevChild: ILayoutableChild, align: String, valign: String, childMaxSize: Point, columnIndex?: number, rowIndex?: number, cellShift?: Point): void;
|
|
16
17
|
protected applyChildPosition(child: ILayoutableChild, x: number, y: number): void;
|
|
17
18
|
abstract findRealRowsAndColumnsCount(container: ILayoutableContainer): Point;
|
|
@@ -19,7 +19,7 @@ export class BaseLayout {
|
|
|
19
19
|
var tempChild;
|
|
20
20
|
var tempChildSize;
|
|
21
21
|
for (var childIndex = 0; childIndex < childrenCount; childIndex++) {
|
|
22
|
-
tempChild =
|
|
22
|
+
tempChild = this.getChildAt(container, childIndex);
|
|
23
23
|
tempChildSize = GetSizeTools.getObjectSize(tempChild);
|
|
24
24
|
if (tempChildSize.x > result.x) {
|
|
25
25
|
result.x = tempChildSize.x;
|
|
@@ -30,6 +30,12 @@ export class BaseLayout {
|
|
|
30
30
|
}
|
|
31
31
|
return result;
|
|
32
32
|
}
|
|
33
|
+
getChildAt(container, childIndex) {
|
|
34
|
+
if (this.settings.reverseOrder) {
|
|
35
|
+
childIndex = container.layoutGetChildrenNum() - childIndex - 1;
|
|
36
|
+
}
|
|
37
|
+
return container.layoutGetChildAt(childIndex);
|
|
38
|
+
}
|
|
33
39
|
arrangeChild(child, prevChild, align, valign, childMaxSize, columnIndex = 0, rowIndex = 0, cellShift = null) {
|
|
34
40
|
var tempChildSize = GetSizeTools.getObjectSize(child);
|
|
35
41
|
var newChildPos = new Point();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/BaseLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/BaseLayout.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LayoutConfig.js","sourceRoot":"","sources":["../../../../src/display/views/layout/LayoutConfig.ts"],"names":[],"mappings":"AACA,MAAM,OAAO,YAAY;IAAzB;QAEI,aAAQ,GAAW,CAAC,CAAC;QACrB,aAAQ,GAAW,CAAC,CAAC;QAErB,aAAQ,GAAW,CAAC,CAAC;QACrB,aAAQ,GAAW,CAAC,CAAC;QAErB,UAAK,GAAW,EAAE,CAAC;QACnB,WAAM,GAAW,EAAE,CAAC;QAEpB,2BAAsB,GAAY,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"LayoutConfig.js","sourceRoot":"","sources":["../../../../src/display/views/layout/LayoutConfig.ts"],"names":[],"mappings":"AACA,MAAM,OAAO,YAAY;IAAzB;QAEI,aAAQ,GAAW,CAAC,CAAC;QACrB,aAAQ,GAAW,CAAC,CAAC;QAErB,aAAQ,GAAW,CAAC,CAAC;QACrB,aAAQ,GAAW,CAAC,CAAC;QAErB,UAAK,GAAW,EAAE,CAAC;QACnB,WAAM,GAAW,EAAE,CAAC;QAEpB,2BAAsB,GAAY,IAAI,CAAC;QAEvC,iBAAY,GAAY,KAAK,CAAC;IAElC,CAAC;CAAA"}
|