InfernalGames/tankz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[client] update CreateGamePopup

Browse Source
This commit is contained in:
shmyga
2019-06-10 21:30:30 +03:00
parent 94b3a94cbb
commit ee5de9f3db
4 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "tankz", "name": "tankz",
"version": "0.14.2", "version": "0.14.3",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"dateformat": "^3.0.3", "dateformat": "^3.0.3",

4
src/client/haxe/ru/m/tankz/Style.hx
View File

@@ -37,7 +37,7 @@ class Style {
public static function registerButton(name:String, resource:String):Void { public static function registerButton(name:String, resource:String):Void {
resources.skin.put('button.$name', [ resources.skin.put('button.$name', [
Skin.size(64, 64), Skin.size(42, 42),
new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), lightColor), new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), lightColor),
]); ]);
resources.skin.put('button.$name.small', [ resources.skin.put('button.$name.small', [
@@ -137,7 +137,7 @@ class Style {
Skin.color(darkColor), Skin.color(darkColor),
]); ]);
resources.skin.put("panel", [ resources.skin.put("panel", [
Skin.geometry(new Geometry().setSize("100%", -1).setPadding([20, 10])), Skin.geometry(new Geometry().setSize("100%", -1).setPadding([10, 5])),
Skin.layout(new Layout().setAlign(NONE, MIDDLE)), Skin.layout(new Layout().setAlign(NONE, MIDDLE)),
Skin.color(lightColor), Skin.color(lightColor),
]); ]);

4
src/client/haxe/ru/m/tankz/render/Render.hx
View File

@@ -77,7 +77,9 @@ class Render extends SpriteView implements IRender {
} }
private function clearLayer(layer:DisplayObjectContainer) { private function clearLayer(layer:DisplayObjectContainer) {
while (layer.numChildren > 0) layer.removeChildAt(0); while (layer.numChildren > 0) {
layer.removeChildAt(0);
}
} }
public function reset():Void { public function reset():Void {

18
src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.yaml
View File

@@ -4,7 +4,8 @@ layout.vAlign: middle
view: view:
$type: haxework.view.VGroupView $type: haxework.view.VGroupView
layout.hAlign: center layout.hAlign: center
geometry.size.width: 600 geometry.size.stretch: true
geometry.margin: 10
skinId: window skinId: window
views: views:
- $type: haxework.view.HGroupView - $type: haxework.view.HGroupView
@@ -23,8 +24,8 @@ view:
skinId: window.close skinId: window.close
+onPress: $code:reject('close') +onPress: $code:reject('close')
- $type: haxework.view.VGroupView - $type: haxework.view.VGroupView
geometry.size.width: 100% geometry.size.stretch: true
geometry.padding: 20 geometry.padding: [5, 20]
layout.margin: 5 layout.margin: 5
layout.hAlign: center layout.hAlign: center
views: views:
@@ -34,8 +35,9 @@ view:
text: Type text: Type
- id: type - id: type
$type: haxework.view.DataView $type: haxework.view.DataView
geometry.size.width: 100%
layout: layout:
$type: haxework.view.layout.HorizontalLayout $type: haxework.view.layout.TailLayout
margin: 10 margin: 10
factory: $this:gameTypeViewFactory factory: $this:gameTypeViewFactory
+onItemSelect: $this:onGameTypeSelect +onItemSelect: $this:onGameTypeSelect
@@ -47,7 +49,13 @@ view:
geometry.size.width: 100% geometry.size.width: 100%
skinId: text skinId: text
text: Level text: Level
- id: level - $type: haxework.view.ScrollView
geometry.size.stretch: true
scroll:
$type: haxework.view.list.VScrollBarView
skinId: scroll.vertical
view:
id: level
$type: haxework.view.DataView $type: haxework.view.DataView
geometry.size.width: 100% geometry.size.width: 100%
layout: layout: