Fix buttons. Fix window.

evoto-tech · Apr 14, 2017 · d2768f0 · d2768f0
1 parent 660dcf2
commit d2768f0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/EvotoClient/Views/FindVote.xaml b/EvotoClient/Views/FindVote.xaml
@@ -47,7 +47,7 @@
             To do so, please enter the magic words given to you after you voted.
         </TextBlock>
 
-        <Button Grid.Row="3" Command="{Binding FindCommand}">Find</Button>
+        <Button Grid.Row="3" Command="{Binding FindCommand}" Margin="0 0 0 4">Find</Button>
         <Button Grid.Row="4" Command="{Binding BackCommand}">Back</Button>
     </Grid>
 </UserControl>
diff --git a/EvotoClient/Views/HomeView.xaml b/EvotoClient/Views/HomeView.xaml
@@ -91,7 +91,9 @@
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
-        <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center">
+        <Grid
+            Visibility="{Binding VotesVisible, Converter={StaticResource BoolToVisibilityHiddenConverter}}"
+            Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="16" />
                 <ColumnDefinition />
@@ -103,7 +105,7 @@
                                      VerticalAlignment="Center" />
             <TextBlock Grid.Column="1" Grid.Row="0" FontSize="14" Margin="3 0 0 0" VerticalAlignment="Center">Indicates an encrypted vote.</TextBlock>
         </Grid>
-        <Button Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Command="{Binding ProceedCommand}">Proceed</Button>
+        <Button Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Command="{Binding ProceedCommand}" Margin="0 0 0 4">Proceed</Button>
         <Button Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Command="{Binding RefreshCommand}">Refresh</Button>
 
         <materialDesign:Snackbar Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"

diff --git a/EvotoClient/Views/MainWindow.xaml b/EvotoClient/Views/MainWindow.xaml
@@ -8,8 +8,8 @@
         xmlns:local="clr-namespace:EvotoClient.Views"
         xmlns:converters="clr-namespace:EvotoClient.Converters"
         mc:Ignorable="d ignore"
-        Height="550"
-        Width="700"
+        Height="550" Width="700"
+        ResizeMode="CanMinimize"
         Style="{DynamicResource ClientWindowStyle}"
         UseLayoutRounding="True"
         TextElement.FontWeight="Regular"

diff --git a/EvotoClient/Views/PostVoteView.xaml b/EvotoClient/Views/PostVoteView.xaml
@@ -51,7 +51,7 @@
             Visibility="{Binding Encrypted, Converter={StaticResource BoolToVisibilityHiddenConverter}}"
             Text="{Binding EncryptedText}" />
 
-        <Button Grid.Row="3" Command="{Binding ProceedCommand}">Results</Button>
+        <Button Grid.Row="3" Command="{Binding ProceedCommand}" Margin="0 0 0 4">Results</Button>
         <Button Grid.Row="4" Command="{Binding HomeCommand}">Home</Button>
     </Grid>
 </UserControl>
diff --git a/EvotoClient/Views/ResultsView.xaml b/EvotoClient/Views/ResultsView.xaml
@@ -63,7 +63,7 @@
             <materialDesign:PackIcon Kind="ArrowRightBold" />
         </Button>
 
-        <Button Grid.Row="3" Grid.ColumnSpan="3" Command="{Binding FindVoteCommand}">Find My Vote</Button>
+        <Button Grid.Row="3" Grid.ColumnSpan="3" Command="{Binding FindVoteCommand}" Margin="0 0 0 4">Find My Vote</Button>
         <Button Grid.Row="4" Grid.ColumnSpan="3" Command="{Binding BackCommand}">Back</Button>
     </Grid>
 </UserControl>
diff --git a/EvotoClient/Views/VoteView.xaml b/EvotoClient/Views/VoteView.xaml
@@ -78,7 +78,7 @@
                    Text="{Binding ErrorMessage}" TextWrapping="Wrap"
                    HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center" />
 
-        <Button Grid.Row="5" Grid.ColumnSpan="3" Command="{Binding VoteCommand}">Vote</Button>
-        <Button Grid.Row="6" Grid.ColumnSpan="3" Command="{Binding BackCommand}">Back</Button>
+        <Button Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Command="{Binding VoteCommand}" Margin="0 0 0 4">Vote</Button>
+        <Button Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Command="{Binding BackCommand}">Back</Button>
     </Grid>
 </UserControl>