Skip to content

Commit d181de5

Browse files
committed
Made layout of gamername input responsive and removed useless StackPanel
1 parent 1b8accf commit d181de5

1 file changed

Lines changed: 41 additions & 10 deletions

File tree

src/Codebreaker.Uno/CodebreakerUno/Views/Pages/GamePage.xaml

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,36 @@
2020
</Style>
2121
</Page.Resources>
2222
<Grid x:Name="ContentArea">
23+
<VisualStateManager.VisualStateGroups>
24+
<VisualStateGroup>
25+
<VisualState x:Name="WideState">
26+
<VisualState.StateTriggers>
27+
<AdaptiveTrigger MinWindowWidth="641" />
28+
</VisualState.StateTriggers>
29+
<VisualState.Setters>
30+
<Setter Target="NameInput.(Grid.Column)" Value="0" />
31+
<Setter Target="NameInput.(Grid.RowSpan)" Value="2" />
32+
<Setter Target="NameSubmitButton.(Grid.Column)" Value="1" />
33+
<Setter Target="NameSubmitButton.(Grid.RowSpan)" Value="2" />
34+
35+
<Setter Target="PegSelection.Margin" Value="80,0,0,0" />
36+
</VisualState.Setters>
37+
</VisualState>
38+
<VisualState x:Name="NarrowState">
39+
<VisualState.StateTriggers>
40+
<AdaptiveTrigger MinWindowWidth="0" />
41+
</VisualState.StateTriggers>
42+
<VisualState.Setters>
43+
<Setter Target="NameInput.(Grid.Row)" Value="0" />
44+
<Setter Target="NameInput.(Grid.ColumnSpan)" Value="2" />
45+
<Setter Target="NameSubmitButton.(Grid.Row)" Value="1" />
46+
<Setter Target="NameSubmitButton.(Grid.ColumnSpan)" Value="2" />
47+
48+
<Setter Target="PegSelection.Margin" Value="0" />
49+
</VisualState.Setters>
50+
</VisualState>
51+
</VisualStateGroup>
52+
</VisualStateManager.VisualStateGroups>
2353
<Grid.RowDefinitions>
2454
<RowDefinition Height="auto" />
2555
<RowDefinition Height="auto" />
@@ -32,13 +62,18 @@
3262
<Grid
3363
Grid.Row="0"
3464
ColumnSpacing="25"
65+
RowSpacing="15"
3566
Visibility="{x:Bind ViewModel.GameStatus, Mode=OneWay, Converter={StaticResource GameStatusVisibility}, ConverterParameter=Start}">
3667
<Grid.ColumnDefinitions>
3768
<ColumnDefinition />
3869
<ColumnDefinition Width="Auto" />
3970
</Grid.ColumnDefinitions>
40-
<Grid Grid.Column="0">
41-
<!-- The extra grid and the empy (enabled) TextBlock are necessary for showing the tooltip over the (disabled) TextBox. -->
71+
<Grid.RowDefinitions>
72+
<RowDefinition Height="Auto" />
73+
<RowDefinition Height="Auto" />
74+
</Grid.RowDefinitions>
75+
<Grid x:Name="NameInput">
76+
<!--The extra grid and the empy (enabled) TextBlock are necessary for showing the tooltip over the (disabled) TextBox.-->
4277
<TextBlock />
4378
<TextBox
4479
IsEnabled="{x:Bind ViewModel.IsNameEnterable, Mode=OneWay}"
@@ -54,7 +89,7 @@
5489
</ToolTipService.ToolTip>
5590
</Grid>
5691
<Button
57-
Grid.Column="1"
92+
x:Name="NameSubmitButton"
5893
VerticalAlignment="Bottom"
5994
HorizontalAlignment="Stretch"
6095
Padding="35,8"
@@ -67,15 +102,11 @@
67102
</Button>
68103
</Grid>
69104
<!--Gamebar section-->
70-
<StackPanel
71-
Orientation="Horizontal"
105+
<components:PegSelectionComponent
106+
x:Name="PegSelection"
72107
Grid.Row="1"
73-
Visibility="{x:Bind ViewModel.GameStatus, Mode=OneWay, Converter={StaticResource GameStatusVisibility}, ConverterParameter=Cancelable}">
74-
<components:PegSelectionComponent
75-
Grid.Row="3"
76-
Margin="65,0,0,0"
108+
Visibility="{x:Bind ViewModel.GameStatus, Mode=OneWay, Converter={StaticResource GameStatusVisibility}, ConverterParameter=Cancelable}"
77109
ViewModel="{x:Bind ViewModel, Mode=OneWay}" />
78-
</StackPanel>
79110
<!--Move section-->
80111
<ScrollViewer Grid.Row="2" Padding="0,0,0,15" x:Name="pegScrollViewer">
81112
<ListBox

0 commit comments

Comments
 (0)