@flashist/appframework 0.0.206 → 0.0.208
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/button/SimpleButtonConfig.js.map +1 -1
- package/display/views/button/SimpleButtonView.d.ts +3 -0
- package/display/views/button/SimpleButtonView.js +10 -16
- package/display/views/button/SimpleButtonView.js.map +1 -1
- package/package.json +1 -1
- package/pages/views/BasePageView.d.ts +2 -1
- package/pages/views/BasePageView.js +4 -3
- package/pages/views/BasePageView.js.map +1 -1
|
@@ -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,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;IACnC,WAAW,EAAE,EAAmB;
|
|
1
|
+
{"version":3,"file":"SimpleButtonConfig.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonConfig.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACrC,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;IACnC,WAAW,EAAE,EAAmB;IAEhC,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;AA0BD,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"}
|
|
@@ -2,6 +2,7 @@ import { FContainer, FLabel, Sprite, Graphics, DisplayObjectContainer } from "@f
|
|
|
2
2
|
import { SimpleButtonConfig } from "./SimpleButtonConfig";
|
|
3
3
|
import { AppResizableContainer } from "../resize/AppResizableContainer";
|
|
4
4
|
import { IToggableItem } from "../togglegroup/IToggableItem";
|
|
5
|
+
import { BaseLayout, BaseLayoutableContainer } from "../layout";
|
|
5
6
|
export declare class SimpleButtonView<DataType extends object = object> extends AppResizableContainer<DataType> implements IToggableItem {
|
|
6
7
|
static NORMAL_TO_SELECTED_MAP: any;
|
|
7
8
|
static SELECTED_TO_NORMAL_MAP: any;
|
|
@@ -12,9 +13,11 @@ export declare class SimpleButtonView<DataType extends object = object> extends
|
|
|
12
13
|
protected config: SimpleButtonConfig;
|
|
13
14
|
protected bg: Graphics;
|
|
14
15
|
protected contentCont: FContainer;
|
|
16
|
+
protected layoutableCont: BaseLayoutableContainer;
|
|
15
17
|
protected icon: Sprite;
|
|
16
18
|
label: FLabel;
|
|
17
19
|
protected viewCont: FContainer;
|
|
20
|
+
protected contentLayout: BaseLayout;
|
|
18
21
|
constructor(config: SimpleButtonConfig);
|
|
19
22
|
protected construction(config: SimpleButtonConfig): void;
|
|
20
23
|
protected addListeners(): void;
|
|
@@ -3,6 +3,7 @@ import { SimpleButtonDefaultConfig } from "./SimpleButtonConfig";
|
|
|
3
3
|
import { SimpleButtonState } from "./SimpleButtonState";
|
|
4
4
|
import { AppResizableContainer } from "../resize/AppResizableContainer";
|
|
5
5
|
import { ObjectTools } from '@flashist/fcore';
|
|
6
|
+
import { BaseLayoutableContainer } from "../layout";
|
|
6
7
|
export class SimpleButtonView extends AppResizableContainer {
|
|
7
8
|
constructor(config) {
|
|
8
9
|
super(config);
|
|
@@ -29,10 +30,12 @@ export class SimpleButtonView extends AppResizableContainer {
|
|
|
29
30
|
this.addChild(this.contentCont);
|
|
30
31
|
this.viewCont = new FContainer();
|
|
31
32
|
this.contentCont.addChild(this.viewCont);
|
|
33
|
+
this.layoutableCont = new BaseLayoutableContainer();
|
|
34
|
+
this.contentCont.addChild(this.layoutableCont);
|
|
32
35
|
this.icon = new Sprite();
|
|
33
|
-
this.
|
|
36
|
+
this.layoutableCont.addChild(this.icon);
|
|
34
37
|
this.label = new FLabel(this.config.labelConfig);
|
|
35
|
-
this.
|
|
38
|
+
this.layoutableCont.addChild(this.label);
|
|
36
39
|
//
|
|
37
40
|
// this.label.interactive = true;
|
|
38
41
|
// this.label.interactiveChildren = true;
|
|
@@ -76,26 +79,17 @@ export class SimpleButtonView extends AppResizableContainer {
|
|
|
76
79
|
}
|
|
77
80
|
arrange() {
|
|
78
81
|
super.arrange();
|
|
82
|
+
if (this.contentLayout) {
|
|
83
|
+
this.contentLayout.arrange(this.layoutableCont);
|
|
84
|
+
}
|
|
79
85
|
if (this.resizeSize.x && this.resizeSize.y) {
|
|
80
86
|
this.contentCont.scale.set(1);
|
|
81
87
|
const tempScale = DisplayResizeTools.getScale(this.contentCont.width, this.contentCont.height, this.resizeSize.x, this.resizeSize.y);
|
|
82
88
|
this.contentCont.scale.set(tempScale);
|
|
83
89
|
}
|
|
84
90
|
this.updateBg();
|
|
85
|
-
this.
|
|
86
|
-
this.
|
|
87
|
-
// this.bg.width = this.contentCont.width;
|
|
88
|
-
// this.bg.height = this.contentCont.height;
|
|
89
|
-
// if (this.config.bgConfig?.resizeBg) {
|
|
90
|
-
// if (this.bg.width !== this.resizeSize.x ||
|
|
91
|
-
// this.bg.height !== this.resizeSize.y) {
|
|
92
|
-
// this.updateBg();
|
|
93
|
-
// }
|
|
94
|
-
// }
|
|
95
|
-
// this.label.width = this.bg.width;
|
|
96
|
-
// this.label.height = this.bg.height;
|
|
97
|
-
// this.label.x = this.bg.x + Math.floor((this.bg.width - this.label.width) / 2);
|
|
98
|
-
// this.label.y = this.bg.y + Math.floor((this.bg.height - this.label.height) / 2);
|
|
91
|
+
this.contentCont.x = this.bg.x + Math.floor((this.bg.width - this.contentCont.width) / 2) + this.config.bgConfig.contentToBgShiftX;
|
|
92
|
+
this.contentCont.y = this.bg.y + Math.floor((this.bg.height - this.contentCont.height) / 2) + this.config.bgConfig.contentToBgShiftY;
|
|
99
93
|
}
|
|
100
94
|
get enabled() {
|
|
101
95
|
return this._enabled;
|
|
@@ -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,MAAM,iBAAiB,CAAC;AAE9I,OAAO,EAAgD,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC/G,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
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,MAAM,iBAAiB,CAAC;AAE9I,OAAO,EAAgD,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC/G,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,WAAW,CAAC;AAEhE,MAAM,OAAO,gBAAmD,SAAQ,qBAA+B;IAiDnG,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;QAC3D,wCAAwC;QACxC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE3C,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,IAAI,CAAC,QAAQ,GAAG,IAAI,UAAU,EAAE,CAAC;QACjC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzC,IAAI,CAAC,cAAc,GAAG,IAAI,uBAAuB,EAAE,CAAC;QACpD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAE/C,IAAI,CAAC,IAAI,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExC,IAAI,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,EAAE;QACF,iCAAiC;QACjC,yCAAyC;QAEzC,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;YACpB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnD;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE;YACxC,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;SACzC;QAGD,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC;QACnI,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IACzI,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;YACzB,OAAO;SACV;QAED,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QAEtB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;SAC9D;aAAM;YACH,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;SAChE;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAED,IAAW,IAAI;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IAC3B,CAAC;IACD,IAAW,IAAI,CAAC,KAAa;QACzB,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC;QACxB,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;YACrB,OAAO;SACV;QAED,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QAEpB,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,KAAK,CAAC,UAAU,EAAE,CAAC;QAEnB,IAAI,eAAe,GAAW,IAAI,CAAC,KAAK,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YACtC,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACf,eAAe,GAAG,gBAAgB,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACzE;SACJ;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YACtC,eAAe,GAAG,iBAAiB,CAAC,MAAM,CAAC;SAC9C;QAED,IAAI,UAAU,GAA6B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC/E,IAAI,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK,KAAK,CAAC,EAAE;YAC5C,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;SACjC;QAED,IAAI,UAAU,CAAC,IAAI,EAAE;YACjB,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SACrD;QAED,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;SAE3B;aAAM;YACH,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;YACzB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;SACtB;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;YACxB,OAAO;SACV;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;YACf,MAAM,GAAG,gBAAgB,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;SACjE;QAED,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,GAAG,WAAW,CAAC;SACxB;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,eAAe,CAAC,IAA4B;QAC/C,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAEO,QAAQ;QACZ,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAChB,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC9E,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAE3H,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,GAAG,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,GAAG,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAElN,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC;;AAhTa,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"}
|
package/package.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FContainer, Graphics, Point, Rectangle } from "@flashist/flibs";
|
|
1
|
+
import { FContainer, Graphics, Point, Rectangle, IResizeConfig } from "@flashist/flibs";
|
|
2
2
|
import { BaseAppView } from "../../base/views/BaseAppView";
|
|
3
3
|
export declare class BasePageView extends BaseAppView {
|
|
4
4
|
private _sizeArea;
|
|
@@ -8,6 +8,7 @@ export declare class BasePageView extends BaseAppView {
|
|
|
8
8
|
protected contentCont: FContainer;
|
|
9
9
|
protected contentContReversedResizeSize: Rectangle;
|
|
10
10
|
protected contentContLocalPosOfGlobalZero: Point;
|
|
11
|
+
protected resizeConfig: IResizeConfig;
|
|
11
12
|
protected construction(...args: any[]): void;
|
|
12
13
|
get sizeArea(): Rectangle;
|
|
13
14
|
set sizeArea(value: Rectangle);
|
|
@@ -8,11 +8,12 @@ export class BasePageView extends BaseAppView {
|
|
|
8
8
|
this.sizeAreaColor = 0x0000FF;
|
|
9
9
|
this.sizeAreaColorAlpha = 0.5;
|
|
10
10
|
}
|
|
11
|
-
// protected reversedScaleContentLocalPosCached: Point;
|
|
12
|
-
// protected reversedScaleContentGlobalPosCached: Point;
|
|
13
11
|
construction(...args) {
|
|
14
12
|
super.construction(args);
|
|
15
13
|
// appState.app.config = getInstance(AppConfigModel);
|
|
14
|
+
this.resizeConfig = {
|
|
15
|
+
upscaleAllowed: false
|
|
16
|
+
};
|
|
16
17
|
this.contentContReversedResizeSize = new Rectangle();
|
|
17
18
|
this.contentContLocalPosOfGlobalZero = new Point();
|
|
18
19
|
// this.reversedScaleContentLocalPosCached = new Point();
|
|
@@ -58,7 +59,7 @@ export class BasePageView extends BaseAppView {
|
|
|
58
59
|
// Reset previous scale
|
|
59
60
|
this.contentCont.scale.set(1, 1);
|
|
60
61
|
// Scale according to the current size
|
|
61
|
-
let tempScale = DisplayResizeTools.getScale(this.sizeArea.width, this.sizeArea.height, this.resizeSize.x, this.resizeSize.y);
|
|
62
|
+
let tempScale = DisplayResizeTools.getScale(this.sizeArea.width, this.sizeArea.height, this.resizeSize.x, this.resizeSize.y, this.resizeConfig);
|
|
62
63
|
this.contentCont.scale.set(tempScale);
|
|
63
64
|
/*this.contentCont.x = this.sizeArea.x + Math.floor((this.resizeSize.x - this.contentCont.width) / 2);
|
|
64
65
|
this.contentCont.y = this.sizeArea.y + Math.floor((this.resizeSize.y - this.contentCont.height) / 2);*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasePageView.js","sourceRoot":"","sources":["../../../src/pages/views/BasePageView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAe,QAAQ,EAAE,KAAK,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"BasePageView.js","sourceRoot":"","sources":["../../../src/pages/views/BasePageView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAe,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAGzH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,MAAM,OAAO,YAAa,SAAQ,WAAW;IAA7C;QAEI,4CAA4C;;QAIlC,kBAAa,GAAW,QAAQ,CAAC;QACjC,uBAAkB,GAAW,GAAG,CAAC;IAoH/C,CAAC;IAzGa,YAAY,CAAC,GAAG,IAAI;QAC1B,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEzB,qDAAqD;QAErD,IAAI,CAAC,YAAY,GAAG;YAChB,cAAc,EAAE,KAAK;SACxB,CAAC;QAEF,IAAI,CAAC,6BAA6B,GAAG,IAAI,SAAS,EAAE,CAAC;QACrD,IAAI,CAAC,+BAA+B,GAAG,IAAI,KAAK,EAAE,CAAC;QACnD,yDAAyD;QACzD,0DAA0D;QAE1D,IAAI,CAAC,WAAW,GAAG,IAAI,UAAU,EAAE,CAAC;QACpC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChC,IAAI,CAAC,WAAW,CAAC,WAAW,GAAG,IAAI,CAAC;QAEpC,IAAI,CAAC,YAAY,GAAG,IAAI,QAAQ,EAAE,CAAC;QACnC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC7C,EAAE;QACF,+BAA+B;QAC/B,IAAI,CAAC,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;QAElC,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;QAEjC,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAC,QAAQ,EAAkB,CAAC;QACzD,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAC1B,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EACnC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EACnC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,EACvC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAC3C,CAAC;SACL;QACD,EAAE;QACF,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC9B,CAAC;IAED,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,IAAW,QAAQ,CAAC,KAAgB;QAChC,IAAI,KAAK,CAAC,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3B,KAAK,CAAC,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3B,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,QAAQ,CAAC,KAAK;YACnC,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACvC,OAAO;SACV;QAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAE9B,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC9B,CAAC;IAES,kBAAkB;QACxB,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,EAAE;QACF,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACzE,IAAI,CAAC,YAAY,CAAC,QAAQ,CACtB,IAAI,CAAC,QAAQ,CAAC,CAAC,EACf,IAAI,CAAC,QAAQ,CAAC,CAAC,EACf,IAAI,CAAC,QAAQ,CAAC,KAAK,EACnB,IAAI,CAAC,QAAQ,CAAC,MAAM,CACvB,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;IAChC,CAAC;IAES,OAAO;QACb,KAAK,CAAC,OAAO,EAAE,CAAC;QAEhB,uBAAuB;QACvB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEjC,sCAAsC;QACtC,IAAI,SAAS,GAAW,kBAAkB,CAAC,QAAQ,CAC/C,IAAI,CAAC,QAAQ,CAAC,KAAK,EACnB,IAAI,CAAC,QAAQ,CAAC,MAAM,EACpB,IAAI,CAAC,UAAU,CAAC,CAAC,EACjB,IAAI,CAAC,UAAU,CAAC,CAAC,EACjB,IAAI,CAAC,YAAY,CACpB,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC;+GACuG;QACvG,gGAAgG;QAChG,iEAAiE;QACjE,iGAAiG;QACjG,iEAAiE;QAEjE,kEAAkE;QAClE,kEAAkE;QAClE,gHAAgH;QAChH,EAAE;QACF,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,+BAA+B,CAAC,CAAC;QACrF,IAAI,CAAC,6BAA6B,CAAC,CAAC,GAAG,IAAI,CAAC,+BAA+B,CAAC,CAAC,CAAC;QAC9E,IAAI,CAAC,6BAA6B,CAAC,CAAC,GAAG,IAAI,CAAC,+BAA+B,CAAC,CAAC,CAAC;QAC9E,IAAI,CAAC,6BAA6B,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACpG,IAAI,CAAC,6BAA6B,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC;IAED,IAAW,YAAY;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IAC1C,CAAC;CACJ"}
|