From d2383fc4f06aa015e6064e58ed37b1ffe3346af6 Mon Sep 17 00:00:00 2001 From: shmyga Date: Mon, 4 Mar 2019 21:12:30 +0300 Subject: [PATCH] [client] add button.level skin --- src/client/haxe/ru/m/tankz/Style.hx | 5 +++++ .../haxe/ru/m/tankz/frame/classic/ClassicLevelFrame.yaml | 2 +- src/client/haxe/ru/m/tankz/frame/common/LevelFrame.hx | 2 +- src/client/haxe/ru/m/tankz/frame/dota/DotaLevelFrame.yaml | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/client/haxe/ru/m/tankz/Style.hx b/src/client/haxe/ru/m/tankz/Style.hx index 280c810..9357a60 100644 --- a/src/client/haxe/ru/m/tankz/Style.hx +++ b/src/client/haxe/ru/m/tankz/Style.hx @@ -47,5 +47,10 @@ class Style { resources.skin.put("border", [ Skin.border(ColorUtils.multiply(lightColor, 1.5), 1, 2), ]); + resources.skin.put("button.level", [ + Skin.buttonColor(lightColor), + Skin.text(textColor, 24, fontFamily), + Skin.size(64, 64), + ]); } } diff --git a/src/client/haxe/ru/m/tankz/frame/classic/ClassicLevelFrame.yaml b/src/client/haxe/ru/m/tankz/frame/classic/ClassicLevelFrame.yaml index cd663bb..38157d4 100644 --- a/src/client/haxe/ru/m/tankz/frame/classic/ClassicLevelFrame.yaml +++ b/src/client/haxe/ru/m/tankz/frame/classic/ClassicLevelFrame.yaml @@ -18,7 +18,7 @@ views: $type: haxework.gui.DataView layout: $type: haxework.gui.layout.TailLayout - margin: 2 + margin: 5 factory: $this:levelViewFactory +onDataSelect: $code:function(value) level = value geometry.size.stretch: true diff --git a/src/client/haxe/ru/m/tankz/frame/common/LevelFrame.hx b/src/client/haxe/ru/m/tankz/frame/common/LevelFrame.hx index 84b2b7e..fc2b80c 100644 --- a/src/client/haxe/ru/m/tankz/frame/common/LevelFrame.hx +++ b/src/client/haxe/ru/m/tankz/frame/common/LevelFrame.hx @@ -53,7 +53,7 @@ class LevelFrame extends GroupView { private function levelViewFactory(index:Int, level:Int):ButtonView { var view = new ButtonView(); view.text = '${level}'; - resources.skin.bind("button.simple", view, "skin"); + resources.skin.bind("button.level", view, "skin"); return view; } } diff --git a/src/client/haxe/ru/m/tankz/frame/dota/DotaLevelFrame.yaml b/src/client/haxe/ru/m/tankz/frame/dota/DotaLevelFrame.yaml index 0c113fb..6154007 100644 --- a/src/client/haxe/ru/m/tankz/frame/dota/DotaLevelFrame.yaml +++ b/src/client/haxe/ru/m/tankz/frame/dota/DotaLevelFrame.yaml @@ -15,7 +15,7 @@ views: $type: haxework.gui.DataView layout: $type: haxework.gui.layout.TailLayout - margin: 2 + margin: 5 factory: $this:levelViewFactory +onDataSelect: $code:function(value) level = value geometry.size.percent: [50, 100]