[client] update to haxework
This commit is contained in:
@@ -5,7 +5,8 @@ layout:
|
|||||||
views:
|
views:
|
||||||
- $type: haxework.view.group.VGroupView
|
- $type: haxework.view.group.VGroupView
|
||||||
style: container
|
style: container
|
||||||
layout.overflow: true
|
overflow.x: crop
|
||||||
|
overflow.y: crop
|
||||||
views:
|
views:
|
||||||
- id: game
|
- id: game
|
||||||
$type: ru.m.tankz.view.game.GameView
|
$type: ru.m.tankz.view.game.GameView
|
||||||
|
|||||||
@@ -1,22 +1,21 @@
|
|||||||
---
|
---
|
||||||
views:
|
views:
|
||||||
- $type: haxework.view.group.VGroupView
|
- $type: haxework.view.group.VGroupView
|
||||||
style: container
|
style: container
|
||||||
geometry.padding: 20
|
geometry.padding: 20
|
||||||
views:
|
views:
|
||||||
- id: header
|
- id: header
|
||||||
$type: haxework.view.form.LabelView
|
$type: haxework.view.form.LabelView
|
||||||
style: text.header
|
style: text.header
|
||||||
- $type: haxework.view.ScrollView
|
- id: levels
|
||||||
geometry.stretch: true
|
$type: haxework.view.data.DataView
|
||||||
view:
|
geometry.width: 100%
|
||||||
id: levels
|
geometry.height: 100%
|
||||||
$type: haxework.view.data.DataView
|
overflow.y: scroll
|
||||||
geometry.width: 100%
|
layout:
|
||||||
layout:
|
$type: haxework.view.layout.TailLayout
|
||||||
$type: haxework.view.layout.TailLayout
|
rowSize: 10
|
||||||
rowSize: 10
|
margin: 5
|
||||||
margin: 5
|
factory: ~levelViewFactory
|
||||||
factory: ~levelViewFactory
|
+onItemSelect: ~onLevelSelect
|
||||||
+onItemSelect: ~onLevelSelect
|
geometry.padding: 10
|
||||||
geometry.padding: 10
|
|
||||||
|
|||||||
@@ -1,26 +1,24 @@
|
|||||||
---
|
---
|
||||||
views:
|
views:
|
||||||
- $type: haxework.view.group.VGroupView
|
- $type: haxework.view.group.VGroupView
|
||||||
style: container
|
style: container
|
||||||
geometry.padding: 20
|
geometry.padding: 20
|
||||||
views:
|
views:
|
||||||
- $type: haxework.view.form.LabelView
|
- $type: haxework.view.form.LabelView
|
||||||
style: text.header
|
style: text.header
|
||||||
text: Settings
|
text: Settings
|
||||||
- $type: haxework.view.ScrollView
|
- $type: haxework.view.group.GroupView
|
||||||
geometry.stretch: true
|
geometry.width: 100%
|
||||||
view:
|
geometry.height: 100%
|
||||||
$type: haxework.view.group.GroupView
|
overflow.y: scroll
|
||||||
geometry.stretch: true
|
layout:
|
||||||
layout:
|
$type: haxework.view.layout.TailLayout
|
||||||
$type: haxework.view.layout.TailLayout
|
vAlign: top
|
||||||
vAlign: top
|
margin: 20
|
||||||
margin: 20
|
views:
|
||||||
overflow: true
|
- id: settings0
|
||||||
views:
|
$type: ru.m.tankz.view.settings.SettingsEditor
|
||||||
- id: settings0
|
controlIndex: 0
|
||||||
$type: ru.m.tankz.view.settings.SettingsEditor
|
- id: settings1
|
||||||
controlIndex: 0
|
$type: ru.m.tankz.view.settings.SettingsEditor
|
||||||
- id: settings1
|
controlIndex: 1
|
||||||
$type: ru.m.tankz.view.settings.SettingsEditor
|
|
||||||
controlIndex: 1
|
|
||||||
|
|||||||
@@ -2,71 +2,70 @@
|
|||||||
layout.hAlign: center
|
layout.hAlign: center
|
||||||
layout.vAlign: middle
|
layout.vAlign: middle
|
||||||
view:
|
view:
|
||||||
$type: haxework.view.group.VGroupView
|
$type: haxework.view.group.VGroupView
|
||||||
layout.hAlign: center
|
layout.hAlign: center
|
||||||
geometry.stretch: true
|
geometry.stretch: true
|
||||||
geometry.margin: 10
|
geometry.margin: 10
|
||||||
style: window
|
style: window
|
||||||
views:
|
views:
|
||||||
- $type: haxework.view.group.HGroupView
|
- $type: haxework.view.group.HGroupView
|
||||||
geometry.width: 100%
|
|
||||||
geometry.padding: 10
|
|
||||||
layout.vAlign: middle
|
|
||||||
views:
|
|
||||||
- id: name
|
|
||||||
$type: haxework.view.form.LabelView
|
|
||||||
geometry.width: 100%
|
|
||||||
geometry.margin.left: 10
|
|
||||||
layout.hAlign: left
|
|
||||||
style: text
|
|
||||||
text: New game
|
|
||||||
- $type: haxework.view.form.ButtonView
|
|
||||||
style: window.close
|
|
||||||
+onPress: ~reject('close')
|
|
||||||
- $type: haxework.view.group.VGroupView
|
|
||||||
geometry.stretch: true
|
|
||||||
geometry.padding: [5, 20]
|
|
||||||
layout.margin: 5
|
|
||||||
layout.hAlign: center
|
|
||||||
views:
|
|
||||||
- $type: haxework.view.form.LabelView
|
|
||||||
geometry.width: 100%
|
geometry.width: 100%
|
||||||
style: text
|
geometry.padding: 10
|
||||||
text: Type
|
layout.vAlign: middle
|
||||||
- id: type
|
views:
|
||||||
$type: haxework.view.data.DataView
|
- id: name
|
||||||
geometry.width: 100%
|
$type: haxework.view.form.LabelView
|
||||||
layout:
|
geometry.width: 100%
|
||||||
$type: haxework.view.layout.TailLayout
|
geometry.margin.left: 10
|
||||||
margin: 10
|
layout.hAlign: left
|
||||||
factory: ~gameTypeViewFactory
|
style: text
|
||||||
+onItemSelect: ~onGameTypeSelect
|
text: New game
|
||||||
data:
|
- $type: haxework.view.form.ButtonView
|
||||||
- "classic"
|
style: window.close
|
||||||
- "dota"
|
+onPress: ~reject('close')
|
||||||
- "death"
|
- $type: haxework.view.group.VGroupView
|
||||||
- $type: haxework.view.form.LabelView
|
|
||||||
geometry.width: 100%
|
|
||||||
style: text
|
|
||||||
text: Level
|
|
||||||
- $type: haxework.view.ScrollView
|
|
||||||
geometry.stretch: true
|
geometry.stretch: true
|
||||||
view:
|
geometry.padding: [5, 20]
|
||||||
id: level
|
layout.margin: 5
|
||||||
$type: haxework.view.data.DataView
|
layout.hAlign: center
|
||||||
geometry.width: 100%
|
views:
|
||||||
layout:
|
- $type: haxework.view.form.LabelView
|
||||||
$type: haxework.view.layout.TailLayout
|
geometry.width: 100%
|
||||||
rowSize: 10
|
style: text
|
||||||
margin: 5
|
text: Type
|
||||||
factory: ~levelViewFactory
|
- id: type
|
||||||
+onItemSelect: ~onLevelSelect
|
$type: haxework.view.data.DataView
|
||||||
geometry.padding: 10
|
geometry.width: 100%
|
||||||
- $type: haxework.view.group.HGroupView
|
layout:
|
||||||
layout.hAlign: center
|
$type: haxework.view.layout.TailLayout
|
||||||
layout.margin: 5
|
margin: 10
|
||||||
style: panel
|
factory: ~gameTypeViewFactory
|
||||||
views:
|
+onItemSelect: ~onGameTypeSelect
|
||||||
- $type: haxework.view.form.ButtonView
|
data:
|
||||||
text: Create
|
- "classic"
|
||||||
+onPress: ~submit()
|
- "dota"
|
||||||
|
- "death"
|
||||||
|
- $type: haxework.view.form.LabelView
|
||||||
|
geometry.width: 100%
|
||||||
|
style: text
|
||||||
|
text: Level
|
||||||
|
- id: level
|
||||||
|
$type: haxework.view.data.DataView
|
||||||
|
geometry.width: 100%
|
||||||
|
geometry.height: 100%
|
||||||
|
overflow.y: scroll
|
||||||
|
layout:
|
||||||
|
$type: haxework.view.layout.TailLayout
|
||||||
|
rowSize: 10
|
||||||
|
margin: 5
|
||||||
|
factory: ~levelViewFactory
|
||||||
|
+onItemSelect: ~onLevelSelect
|
||||||
|
geometry.padding: 10
|
||||||
|
- $type: haxework.view.group.HGroupView
|
||||||
|
layout.hAlign: center
|
||||||
|
layout.margin: 5
|
||||||
|
style: panel
|
||||||
|
views:
|
||||||
|
- $type: haxework.view.form.ButtonView
|
||||||
|
text: Create
|
||||||
|
+onPress: ~submit()
|
||||||
|
|||||||
@@ -2,49 +2,47 @@
|
|||||||
layout.hAlign: center
|
layout.hAlign: center
|
||||||
layout.vAlign: middle
|
layout.vAlign: middle
|
||||||
view:
|
view:
|
||||||
$type: haxework.view.group.VGroupView
|
$type: haxework.view.group.VGroupView
|
||||||
layout.hAlign: center
|
layout.hAlign: center
|
||||||
geometry.width: 100%
|
geometry.width: 100%
|
||||||
geometry.height: 100%
|
geometry.height: 100%
|
||||||
# geometry.width: 400
|
# geometry.width: 400
|
||||||
# geometry.height: 400
|
# geometry.height: 400
|
||||||
geometry.margin: 10
|
geometry.margin: 10
|
||||||
style: window
|
style: window
|
||||||
views:
|
views:
|
||||||
- $type: haxework.view.group.HGroupView
|
- $type: haxework.view.group.HGroupView
|
||||||
geometry.width: 100%
|
geometry.width: 100%
|
||||||
geometry.padding: 10
|
geometry.padding: 10
|
||||||
layout.vAlign: middle
|
layout.vAlign: middle
|
||||||
views:
|
views:
|
||||||
- id: name
|
- id: name
|
||||||
$type: haxework.view.form.LabelView
|
$type: haxework.view.form.LabelView
|
||||||
geometry.width: 100%
|
geometry.width: 100%
|
||||||
geometry.margin.left: 10
|
geometry.margin.left: 10
|
||||||
layout.hAlign: left
|
layout.hAlign: left
|
||||||
style: text
|
style: text
|
||||||
- $type: haxework.view.form.ButtonView
|
- $type: haxework.view.form.ButtonView
|
||||||
style: window.close
|
style: window.close
|
||||||
+onPress: ~reject('close')
|
+onPress: ~reject('close')
|
||||||
- $type: haxework.view.ScrollView
|
- id: slots
|
||||||
geometry.stretch: true
|
$type: haxework.view.data.DataView
|
||||||
layout.hAlign: center
|
geometry.padding: 10
|
||||||
view:
|
geometry.width: 100%
|
||||||
id: slots
|
geometry.height: 100%
|
||||||
$type: haxework.view.data.DataView
|
layout.hAlign: center
|
||||||
geometry.padding: 10
|
overflow.y: scroll
|
||||||
geometry.width: 100%
|
factory: ~slotViewFactory
|
||||||
layout.hAlign: center
|
layout:
|
||||||
factory: ~slotViewFactory
|
$type: haxework.view.layout.VerticalLayout
|
||||||
layout:
|
# $type: haxework.view.layout.TailLayout
|
||||||
$type: haxework.view.layout.VerticalLayout
|
margin: 5
|
||||||
# $type: haxework.view.layout.TailLayout
|
- id: presets
|
||||||
margin: 5
|
$type: haxework.view.data.DataView
|
||||||
- id: presets
|
factory: ~presetViewFactory
|
||||||
$type: haxework.view.data.DataView
|
+onDataSelect: ~onPresetSelect
|
||||||
factory: ~presetViewFactory
|
layout:
|
||||||
+onDataSelect: ~onPresetSelect
|
$type: haxework.view.layout.HorizontalLayout
|
||||||
layout:
|
hAlign: center
|
||||||
$type: haxework.view.layout.HorizontalLayout
|
margin: 5
|
||||||
hAlign: center
|
style: panel
|
||||||
margin: 5
|
|
||||||
style: panel
|
|
||||||
|
|||||||
Reference in New Issue
Block a user