diff --git a/package.json b/package.json index fbd9de3..ebc27ae 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tankz", - "version": "0.14.2", + "version": "0.14.3", "private": true, "devDependencies": { "dateformat": "^3.0.3", diff --git a/src/client/haxe/ru/m/tankz/Style.hx b/src/client/haxe/ru/m/tankz/Style.hx index dffba3b..2d572a1 100644 --- a/src/client/haxe/ru/m/tankz/Style.hx +++ b/src/client/haxe/ru/m/tankz/Style.hx @@ -37,7 +37,7 @@ class Style { public static function registerButton(name:String, resource:String):Void { resources.skin.put('button.$name', [ - Skin.size(64, 64), + Skin.size(42, 42), new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), lightColor), ]); resources.skin.put('button.$name.small', [ @@ -137,7 +137,7 @@ class Style { Skin.color(darkColor), ]); 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.color(lightColor), ]); diff --git a/src/client/haxe/ru/m/tankz/render/Render.hx b/src/client/haxe/ru/m/tankz/render/Render.hx index bab93d5..b38ceaf 100755 --- a/src/client/haxe/ru/m/tankz/render/Render.hx +++ b/src/client/haxe/ru/m/tankz/render/Render.hx @@ -77,7 +77,9 @@ class Render extends SpriteView implements IRender { } private function clearLayer(layer:DisplayObjectContainer) { - while (layer.numChildren > 0) layer.removeChildAt(0); + while (layer.numChildren > 0) { + layer.removeChildAt(0); + } } public function reset():Void { diff --git a/src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.yaml b/src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.yaml index 4642d70..70ad593 100644 --- a/src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.yaml +++ b/src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.yaml @@ -4,7 +4,8 @@ layout.vAlign: middle view: $type: haxework.view.VGroupView layout.hAlign: center - geometry.size.width: 600 + geometry.size.stretch: true + geometry.margin: 10 skinId: window views: - $type: haxework.view.HGroupView @@ -23,8 +24,8 @@ view: skinId: window.close +onPress: $code:reject('close') - $type: haxework.view.VGroupView - geometry.size.width: 100% - geometry.padding: 20 + geometry.size.stretch: true + geometry.padding: [5, 20] layout.margin: 5 layout.hAlign: center views: @@ -34,8 +35,9 @@ view: text: Type - id: type $type: haxework.view.DataView + geometry.size.width: 100% layout: - $type: haxework.view.layout.HorizontalLayout + $type: haxework.view.layout.TailLayout margin: 10 factory: $this:gameTypeViewFactory +onItemSelect: $this:onGameTypeSelect @@ -47,16 +49,22 @@ view: geometry.size.width: 100% skinId: text text: Level - - id: level - $type: haxework.view.DataView - geometry.size.width: 100% - layout: - $type: haxework.view.layout.TailLayout - rowSize: 10 - margin: 5 - factory: $this:levelViewFactory - +onItemSelect: $this:onLevelSelect - geometry.padding: 10 + - $type: haxework.view.ScrollView + geometry.size.stretch: true + scroll: + $type: haxework.view.list.VScrollBarView + skinId: scroll.vertical + view: + id: level + $type: haxework.view.DataView + geometry.size.width: 100% + layout: + $type: haxework.view.layout.TailLayout + rowSize: 10 + margin: 5 + factory: $this:levelViewFactory + +onItemSelect: $this:onLevelSelect + geometry.padding: 10 - $type: haxework.view.HGroupView layout.hAlign: center layout.margin: 5