@flashist/appframework 0.0.61 → 0.0.63
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.
|
@@ -1,18 +1,4 @@
|
|
|
1
1
|
import { IFLabelConfig } from "@flashist/flibs";
|
|
2
2
|
export interface ISimpleButtonConfig {
|
|
3
|
-
bgConfig?: {
|
|
4
|
-
image?: {
|
|
5
|
-
imageId: string;
|
|
6
|
-
};
|
|
7
|
-
vector?: {
|
|
8
|
-
bgColor: number;
|
|
9
|
-
overBgColor: number;
|
|
10
|
-
bgAlpha: number;
|
|
11
|
-
bgBorderColor: number;
|
|
12
|
-
bgBorderAlpha: number;
|
|
13
|
-
bgBorderWidth: number;
|
|
14
|
-
};
|
|
15
|
-
resizeBg: boolean;
|
|
16
|
-
};
|
|
17
3
|
labelConfig?: IFLabelConfig;
|
|
18
4
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FContainer, FLabel
|
|
1
|
+
import { FContainer, FLabel } from "@flashist/flibs";
|
|
2
2
|
import { ISimpleButtonConfig } from "./ISimpleButtonConfig";
|
|
3
3
|
import { ResizableContainer } from "../resize/ResizableContainer";
|
|
4
4
|
import { IToggableItem } from "../togglegroup/IToggableItem";
|
|
@@ -9,7 +9,6 @@ export declare class SimpleButtonView<DataType extends object = object> extends
|
|
|
9
9
|
protected _selected: boolean;
|
|
10
10
|
protected config: ISimpleButtonConfig;
|
|
11
11
|
protected contentCont: FContainer;
|
|
12
|
-
protected bg: Graphics | Sprite;
|
|
13
12
|
protected label: FLabel;
|
|
14
13
|
constructor(config: ISimpleButtonConfig);
|
|
15
14
|
protected construction(config: ISimpleButtonConfig): void;
|
|
@@ -28,6 +27,4 @@ export declare class SimpleButtonView<DataType extends object = object> extends
|
|
|
28
27
|
get selected(): boolean;
|
|
29
28
|
set selected(value: boolean);
|
|
30
29
|
protected findStateValue(normalState: string): string;
|
|
31
|
-
protected createBg(): Sprite | Graphics;
|
|
32
|
-
protected updateBg(): void;
|
|
33
30
|
}
|
|
@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
13
13
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
14
14
|
};
|
|
15
15
|
})();
|
|
16
|
-
import { FContainer, FLabel,
|
|
16
|
+
import { FContainer, FLabel, InteractiveEvent } from "@flashist/flibs";
|
|
17
17
|
import { SimpleButtonState } from "./SimpleButtonState";
|
|
18
18
|
import { ResizableContainer } from "../resize/ResizableContainer";
|
|
19
19
|
var SimpleButtonView = /** @class */ (function (_super) {
|
|
@@ -26,18 +26,21 @@ var SimpleButtonView = /** @class */ (function (_super) {
|
|
|
26
26
|
this.config = config;
|
|
27
27
|
this.contentCont = new FContainer();
|
|
28
28
|
this.addChild(this.contentCont);
|
|
29
|
-
this.bg = this.createBg();
|
|
30
|
-
this.contentCont.addChild(this.bg);
|
|
29
|
+
// this.bg = this.createBg();
|
|
30
|
+
// this.contentCont.addChild(this.bg);
|
|
31
31
|
this.label = new FLabel(this.config.labelConfig);
|
|
32
32
|
this.contentCont.addChild(this.label);
|
|
33
33
|
//
|
|
34
|
-
this.label.interactive =
|
|
35
|
-
this.label.interactiveChildren =
|
|
34
|
+
this.label.interactive = true;
|
|
35
|
+
this.label.interactiveChildren = true;
|
|
36
36
|
this.state = SimpleButtonState.NORMAL;
|
|
37
37
|
this.enabled = true;
|
|
38
|
-
if (!this.config.bgConfig
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
// if (!this.config.bgConfig?.resizeBg) {
|
|
39
|
+
// this.resize(
|
|
40
|
+
// this.bg.width,
|
|
41
|
+
// this.bg.height
|
|
42
|
+
// );
|
|
43
|
+
// }
|
|
41
44
|
};
|
|
42
45
|
SimpleButtonView.prototype.addListeners = function () {
|
|
43
46
|
_super.prototype.addListeners.call(this);
|
|
@@ -59,16 +62,16 @@ var SimpleButtonView = /** @class */ (function (_super) {
|
|
|
59
62
|
};
|
|
60
63
|
SimpleButtonView.prototype.arrange = function () {
|
|
61
64
|
_super.prototype.arrange.call(this);
|
|
62
|
-
if (this.config.bgConfig
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
}
|
|
68
|
-
this.label.width = this.bg.width;
|
|
69
|
-
this.label.height = this.bg.height;
|
|
70
|
-
this.label.x = this.bg.x + Math.floor((this.bg.width - this.label.width) / 2);
|
|
71
|
-
this.label.y = this.bg.y + Math.floor((this.bg.height - this.label.height) / 2);
|
|
65
|
+
// if (this.config.bgConfig?.resizeBg) {
|
|
66
|
+
// if (this.bg.width !== this.resizeSize.x ||
|
|
67
|
+
// this.bg.height !== this.resizeSize.y) {
|
|
68
|
+
// this.updateBg();
|
|
69
|
+
// }
|
|
70
|
+
// }
|
|
71
|
+
// this.label.width = this.bg.width;
|
|
72
|
+
// this.label.height = this.bg.height;
|
|
73
|
+
// this.label.x = this.bg.x + Math.floor((this.bg.width - this.label.width) / 2);
|
|
74
|
+
// this.label.y = this.bg.y + Math.floor((this.bg.height - this.label.height) / 2);
|
|
72
75
|
};
|
|
73
76
|
Object.defineProperty(SimpleButtonView.prototype, "enabled", {
|
|
74
77
|
get: function () {
|
|
@@ -119,7 +122,7 @@ var SimpleButtonView = /** @class */ (function (_super) {
|
|
|
119
122
|
this.interactive = false;
|
|
120
123
|
this.alpha = 0.5;
|
|
121
124
|
}
|
|
122
|
-
this.updateBg();
|
|
125
|
+
// this.updateBg();
|
|
123
126
|
};
|
|
124
127
|
Object.defineProperty(SimpleButtonView.prototype, "selected", {
|
|
125
128
|
get: function () {
|
|
@@ -145,36 +148,6 @@ var SimpleButtonView = /** @class */ (function (_super) {
|
|
|
145
148
|
}
|
|
146
149
|
return result;
|
|
147
150
|
};
|
|
148
|
-
SimpleButtonView.prototype.createBg = function () {
|
|
149
|
-
var result;
|
|
150
|
-
if (this.config.bgConfig.image) {
|
|
151
|
-
result = Sprite.from(this.config.bgConfig.image.imageId);
|
|
152
|
-
}
|
|
153
|
-
else {
|
|
154
|
-
result = new Graphics();
|
|
155
|
-
}
|
|
156
|
-
return result;
|
|
157
|
-
};
|
|
158
|
-
SimpleButtonView.prototype.updateBg = function () {
|
|
159
|
-
if (this.config.bgConfig.image) {
|
|
160
|
-
if (this.config.bgConfig.resizeBg) {
|
|
161
|
-
this.bg.width = this.resizeSize.x;
|
|
162
|
-
this.bg.height = this.resizeSize.y;
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
else {
|
|
166
|
-
var vectorBg = this.bg;
|
|
167
|
-
vectorBg.clear();
|
|
168
|
-
var bgColor = this.config.bgConfig.vector.bgColor;
|
|
169
|
-
if (this.state === SimpleButtonState.SELECTED_NORMAL || this.state === SimpleButtonState.OVER || this.state === SimpleButtonState.SELECTED_OVER) {
|
|
170
|
-
bgColor = this.config.bgConfig.vector.overBgColor;
|
|
171
|
-
}
|
|
172
|
-
vectorBg.beginFill(bgColor, this.config.bgConfig.vector.bgAlpha);
|
|
173
|
-
vectorBg.lineStyle(this.config.bgConfig.vector.bgBorderWidth, this.config.bgConfig.vector.bgBorderColor, this.config.bgConfig.vector.bgBorderAlpha, 0);
|
|
174
|
-
vectorBg.drawRect(0, 0, this.resizeSize.x, this.resizeSize.y);
|
|
175
|
-
vectorBg.endFill();
|
|
176
|
-
}
|
|
177
|
-
};
|
|
178
151
|
return SimpleButtonView;
|
|
179
152
|
}(ResizableContainer));
|
|
180
153
|
export { SimpleButtonView };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleButtonView.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonView.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"SimpleButtonView.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonView.ts"],"names":[],"mappings":"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"}
|