@flashist/appframework 0.0.163 → 0.0.165
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/SimpleButtonView.d.ts +9 -1
- package/display/views/button/SimpleButtonView.js +38 -3
- package/display/views/button/SimpleButtonView.js.map +1 -1
- package/display/views/simplelist/SimpleList.js +3 -2
- package/display/views/simplelist/SimpleList.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FContainer, FLabel, Sprite, DisplayObjectContainer } from "@flashist/flibs";
|
|
1
|
+
import { FContainer, FLabel, Sprite, Graphics, DisplayObjectContainer } from "@flashist/flibs";
|
|
2
2
|
import { SimpleButtonConfig } from "./SimpleButtonConfig";
|
|
3
3
|
import { AppResizableContainer } from "../resize/AppResizableContainer";
|
|
4
4
|
import { IToggableItem } from "../togglegroup/IToggableItem";
|
|
@@ -10,6 +10,9 @@ export declare class SimpleButtonView<DataType extends object = object> extends
|
|
|
10
10
|
protected _state: string;
|
|
11
11
|
protected _selected: boolean;
|
|
12
12
|
protected config: SimpleButtonConfig;
|
|
13
|
+
protected _bgAlpha: number;
|
|
14
|
+
protected _bgColor: number;
|
|
15
|
+
protected bg: Graphics;
|
|
13
16
|
protected contentCont: FContainer;
|
|
14
17
|
protected icon: Sprite;
|
|
15
18
|
protected label: FLabel;
|
|
@@ -35,4 +38,9 @@ export declare class SimpleButtonView<DataType extends object = object> extends
|
|
|
35
38
|
set selected(value: boolean);
|
|
36
39
|
protected findStateValue(normalState: string): string;
|
|
37
40
|
addExternalView(view: DisplayObjectContainer): void;
|
|
41
|
+
private updateBg;
|
|
42
|
+
get bgAlpha(): number;
|
|
43
|
+
set bgAlpha(value: number);
|
|
44
|
+
get bgColor(): number;
|
|
45
|
+
set bgColor(value: number);
|
|
38
46
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FContainer, FLabel, Texture, InteractiveEvent, Sprite, DisplayResizeTools } from "@flashist/flibs";
|
|
1
|
+
import { FContainer, FLabel, Texture, InteractiveEvent, Sprite, DisplayResizeTools, Graphics } from "@flashist/flibs";
|
|
2
2
|
import { SimpleButtonDefaultConfig } from "./SimpleButtonConfig";
|
|
3
3
|
import { SimpleButtonState } from "./SimpleButtonState";
|
|
4
4
|
import { AppResizableContainer } from "../resize/AppResizableContainer";
|
|
@@ -13,10 +13,14 @@ export class SimpleButtonView extends AppResizableContainer {
|
|
|
13
13
|
this.config = ObjectTools.clone(SimpleButtonDefaultConfig);
|
|
14
14
|
// Then override them with passed config
|
|
15
15
|
ObjectTools.copyProps(this.config, config);
|
|
16
|
+
this._bgAlpha = 0;
|
|
17
|
+
this._bgColor = 0x000000;
|
|
16
18
|
this.contentCont = new FContainer();
|
|
17
19
|
this.addChild(this.contentCont);
|
|
18
20
|
// this.bg = this.createBg();
|
|
19
21
|
// this.contentCont.addChild(this.bg);
|
|
22
|
+
this.bg = new Graphics();
|
|
23
|
+
this.addChild(this.bg);
|
|
20
24
|
this.viewCont = new FContainer();
|
|
21
25
|
this.contentCont.addChild(this.viewCont);
|
|
22
26
|
this.icon = new Sprite();
|
|
@@ -24,8 +28,8 @@ export class SimpleButtonView extends AppResizableContainer {
|
|
|
24
28
|
this.label = new FLabel(this.config.labelConfig);
|
|
25
29
|
this.contentCont.addChild(this.label);
|
|
26
30
|
//
|
|
27
|
-
this.label.interactive = true;
|
|
28
|
-
this.label.interactiveChildren = true;
|
|
31
|
+
// this.label.interactive = true;
|
|
32
|
+
// this.label.interactiveChildren = true;
|
|
29
33
|
this.state = SimpleButtonState.NORMAL;
|
|
30
34
|
this.enabled = true;
|
|
31
35
|
// if (!this.config.bgConfig?.resizeBg) {
|
|
@@ -71,6 +75,8 @@ export class SimpleButtonView extends AppResizableContainer {
|
|
|
71
75
|
const tempScale = DisplayResizeTools.getScale(this.contentCont.width, this.contentCont.height, this.resizeSize.x, this.resizeSize.y);
|
|
72
76
|
this.contentCont.scale.set(tempScale);
|
|
73
77
|
}
|
|
78
|
+
this.bg.width = this.contentCont.width;
|
|
79
|
+
this.bg.height = this.contentCont.height;
|
|
74
80
|
// if (this.config.bgConfig?.resizeBg) {
|
|
75
81
|
// if (this.bg.width !== this.resizeSize.x ||
|
|
76
82
|
// this.bg.height !== this.resizeSize.y) {
|
|
@@ -168,6 +174,35 @@ export class SimpleButtonView extends AppResizableContainer {
|
|
|
168
174
|
this.viewCont.addChild(view);
|
|
169
175
|
this.arrange();
|
|
170
176
|
}
|
|
177
|
+
updateBg() {
|
|
178
|
+
this.bg.clear();
|
|
179
|
+
this.bg.beginFill(this.bgColor, 1);
|
|
180
|
+
this.bg.drawRect(0, 0, 10, 10);
|
|
181
|
+
this.bg.endFill();
|
|
182
|
+
this.bg.alpha = this.bgAlpha;
|
|
183
|
+
}
|
|
184
|
+
get bgAlpha() {
|
|
185
|
+
return this.bgAlpha;
|
|
186
|
+
}
|
|
187
|
+
set bgAlpha(value) {
|
|
188
|
+
if (value === this.bgAlpha) {
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
this.bgAlpha = value;
|
|
192
|
+
this.updateBg();
|
|
193
|
+
this.arrange();
|
|
194
|
+
}
|
|
195
|
+
get bgColor() {
|
|
196
|
+
return this.bgColor;
|
|
197
|
+
}
|
|
198
|
+
set bgColor(value) {
|
|
199
|
+
if (value === this.bgColor) {
|
|
200
|
+
return;
|
|
201
|
+
}
|
|
202
|
+
this.bgColor = value;
|
|
203
|
+
this.updateBg();
|
|
204
|
+
this.arrange();
|
|
205
|
+
}
|
|
171
206
|
}
|
|
172
207
|
SimpleButtonView.NORMAL_TO_SELECTED_MAP = (() => {
|
|
173
208
|
let result = {};
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"SimpleButtonView.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonView.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ArrayTools, Dictionary, Logger, ObjectTools } from "@flashist/fcore";
|
|
2
|
-
import { DisplayTools, FContainer, Point } from "@flashist/flibs";
|
|
2
|
+
import { DisplayTools, FContainer, Point, getInstance } from "@flashist/flibs";
|
|
3
3
|
export class SimpleList extends FContainer {
|
|
4
4
|
construction() {
|
|
5
5
|
super.construction();
|
|
@@ -144,7 +144,8 @@ export class SimpleList extends FContainer {
|
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
146
|
if (!tempItem) {
|
|
147
|
-
tempItem = new this.ItemRendererClass();
|
|
147
|
+
// tempItem = new this.ItemRendererClass();
|
|
148
|
+
tempItem = getInstance(this.ItemRendererClass);
|
|
148
149
|
}
|
|
149
150
|
this.addItem(tempItem, itemIndex);
|
|
150
151
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleList.js","sourceRoot":"","sources":["../../../../src/display/views/simplelist/SimpleList.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"SimpleList.js","sourceRoot":"","sources":["../../../../src/display/views/simplelist/SimpleList.ts"],"names":[],"mappings":"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"}
|