@flashist/appframework 0.0.9 → 0.0.10
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/package.json
CHANGED
|
@@ -3,10 +3,12 @@ import { BaseAppView } from "../../base/views/BaseAppView";
|
|
|
3
3
|
import { AppConfigModel } from "../../app/models/AppConfigModel";
|
|
4
4
|
export declare class BasePageView extends BaseAppView {
|
|
5
5
|
protected appConfigModel: AppConfigModel;
|
|
6
|
-
protected
|
|
6
|
+
protected _sizeArea: Rectangle;
|
|
7
7
|
protected sizeAreaView: Graphics;
|
|
8
8
|
protected contentCont: FContainer;
|
|
9
9
|
protected reversedScaleContentScreenSize: Point;
|
|
10
10
|
protected construction(...args: any[]): void;
|
|
11
|
+
set sizeArea(value: Rectangle);
|
|
12
|
+
protected updateSizeAreaView(): void;
|
|
11
13
|
protected arrange(): void;
|
|
12
14
|
}
|
|
@@ -28,10 +28,6 @@ var BasePageView = /** @class */ (function (_super) {
|
|
|
28
28
|
}
|
|
29
29
|
_super.prototype.construction.call(this, args);
|
|
30
30
|
this.appConfigModel = getInstance(AppConfigModel);
|
|
31
|
-
this.sizeArea = new Rectangle();
|
|
32
|
-
if (this.appConfigModel.appConfig.sizeArea) {
|
|
33
|
-
this.sizeArea = new Rectangle(this.appConfigModel.appConfig.sizeArea.x, this.appConfigModel.appConfig.sizeArea.y, this.appConfigModel.appConfig.sizeArea.width, this.appConfigModel.appConfig.sizeArea.height);
|
|
34
|
-
}
|
|
35
31
|
this.reversedScaleContentScreenSize = new Point();
|
|
36
32
|
this.contentCont = new FContainer();
|
|
37
33
|
this.addChild(this.contentCont);
|
|
@@ -39,24 +35,48 @@ var BasePageView = /** @class */ (function (_super) {
|
|
|
39
35
|
this.sizeAreaView = new Graphics();
|
|
40
36
|
this.contentCont.addChild(this.sizeAreaView);
|
|
41
37
|
//
|
|
42
|
-
this.sizeAreaView.beginFill(0x000000, 0.5);
|
|
43
|
-
this.sizeAreaView.drawRect(this.sizeArea.x, this.sizeArea.y, this.sizeArea.width, this.sizeArea.height);
|
|
44
|
-
this.sizeAreaView.endFill();
|
|
45
38
|
this.sizeAreaView.alpha = 0;
|
|
39
|
+
this._sizeArea = new Rectangle();
|
|
40
|
+
if (this.appConfigModel.appConfig.sizeArea) {
|
|
41
|
+
this._sizeArea = new Rectangle(this.appConfigModel.appConfig.sizeArea.x, this.appConfigModel.appConfig.sizeArea.y, this.appConfigModel.appConfig.sizeArea.width, this.appConfigModel.appConfig.sizeArea.height);
|
|
42
|
+
}
|
|
43
|
+
//
|
|
44
|
+
this.updateSizeAreaView();
|
|
45
|
+
};
|
|
46
|
+
Object.defineProperty(BasePageView.prototype, "sizeArea", {
|
|
47
|
+
set: function (value) {
|
|
48
|
+
if (value.x === this._sizeArea.x &&
|
|
49
|
+
value.y === this._sizeArea.y &&
|
|
50
|
+
value.width === this._sizeArea.width &&
|
|
51
|
+
value.height === this.sizeArea.height) {
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
this._sizeArea.copyFrom(value);
|
|
55
|
+
this.updateSizeAreaView();
|
|
56
|
+
},
|
|
57
|
+
enumerable: false,
|
|
58
|
+
configurable: true
|
|
59
|
+
});
|
|
60
|
+
BasePageView.prototype.updateSizeAreaView = function () {
|
|
61
|
+
this.sizeAreaView.clear();
|
|
62
|
+
//
|
|
63
|
+
this.sizeAreaView.beginFill(0x0000FF, 0.5);
|
|
64
|
+
this.sizeAreaView.drawRect(this._sizeArea.x, this._sizeArea.y, this._sizeArea.width, this._sizeArea.height);
|
|
65
|
+
this.sizeAreaView.endFill();
|
|
46
66
|
};
|
|
47
67
|
BasePageView.prototype.arrange = function () {
|
|
48
68
|
_super.prototype.arrange.call(this);
|
|
49
69
|
// Reset previous scale
|
|
50
70
|
this.contentCont.scale.set(1, 1);
|
|
51
71
|
// Scale according to the current size
|
|
52
|
-
var tempScale = DisplayResizeTools.getScale(this.
|
|
72
|
+
var tempScale = DisplayResizeTools.getScale(this._sizeArea.width, this._sizeArea.height, this.resizeSize.x, this.resizeSize.y);
|
|
53
73
|
this.contentCont.scale.set(tempScale);
|
|
54
74
|
/*this.contentCont.x = this.sizeArea.x + Math.floor((this.resizeSize.x - this.contentCont.width) / 2);
|
|
55
75
|
this.contentCont.y = this.sizeArea.y + Math.floor((this.resizeSize.y - this.contentCont.height) / 2);*/
|
|
56
|
-
this.contentCont.x = Math.floor((this.resizeSize.x - (this.
|
|
57
|
-
this.contentCont.x -= Math.floor(this.
|
|
58
|
-
this.contentCont.y = Math.floor((this.resizeSize.y - (this.
|
|
59
|
-
this.contentCont.y -= Math.floor(this.
|
|
76
|
+
this.contentCont.x = Math.floor((this.resizeSize.x - (this._sizeArea.width * tempScale)) / 2);
|
|
77
|
+
this.contentCont.x -= Math.floor(this._sizeArea.x * tempScale);
|
|
78
|
+
this.contentCont.y = Math.floor((this.resizeSize.y - (this._sizeArea.height * tempScale)) / 2);
|
|
79
|
+
this.contentCont.y -= Math.floor(this._sizeArea.y * tempScale);
|
|
60
80
|
this.reversedScaleContentScreenSize.x = Math.floor(this.resizeSize.x / this.contentCont.scale.x);
|
|
61
81
|
this.reversedScaleContentScreenSize.y = Math.floor(this.resizeSize.y / this.contentCont.scale.y);
|
|
62
82
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasePageView.js","sourceRoot":"","sources":["../../../src/pages/views/BasePageView.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE1G,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE;IAAkC,gCAAW;IAA7C;;
|
|
1
|
+
{"version":3,"file":"BasePageView.js","sourceRoot":"","sources":["../../../src/pages/views/BasePageView.ts"],"names":[],"mappings":"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"}
|