Skip to content

Commit 26992f1

Browse files
committed
fix #32
1 parent 0ecdfb2 commit 26992f1

File tree

2 files changed

+19
-29
lines changed

2 files changed

+19
-29
lines changed

Denna/Denna/Views/SubMaster/Add/Task.xaml

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,29 @@
2323
</TransitionCollection>
2424
</Page.Transitions>
2525
<Grid Background="Transparent">
26-
<Grid Margin="0,0,0,48">
27-
<ScrollViewer>
28-
<StackPanel x:Name="Damn">
29-
26+
<Grid Margin="0,0,0,0">
27+
<Grid.RowDefinitions>
28+
<RowDefinition Height="*"/>
29+
<RowDefinition Height="70"/>
30+
</Grid.RowDefinitions>
31+
<ScrollViewer Grid.Row="0" HorizontalAlignment="Center" Margin="0,0,0,0" Grid.RowSpan="2" VerticalAlignment="Center">
32+
<StackPanel x:Name="Damn">
3033

31-
<controls:TemplatedTextBox x:Name="Title" Text="" Margin="10,20,10,0" Height="35" Glyph="" PlaceHolder="Title" />
34+
35+
<controls:TemplatedTextBox x:Name="Title" Text="" Margin="10,20,10,0" Height="35" Glyph="" PlaceHolder="Title" />
3236
<controls:TemplatedTextBox x:Name="Details" Text="" Margin="10,10,10,0" Glyph="" PlaceHolder="Details" />
33-
37+
3438
<StackPanel>
35-
<DatePicker Width="300" HorizontalAlignment="Center" BorderBrush="Transparent" BorderThickness="0" x:Name="datepic" Margin="5,10,5,0" Style="{StaticResource DatePickerStyle}" />
36-
<TimePicker Width="300" BorderThickness="0" BorderBrush="Transparent" HorizontalAlignment="Center" x:Name="timepic" Margin="5,10,5,0" Style="{StaticResource TimePickerStyle}" />
39+
<DatePicker Width="300" HorizontalAlignment="Center" BorderBrush="Transparent" BorderThickness="0" x:Name="datepic" Margin="5,10,5,0" Style="{StaticResource DatePickerStyle}" />
40+
<TimePicker Width="300" BorderThickness="0" BorderBrush="Transparent" HorizontalAlignment="Center" x:Name="timepic" Margin="5,10,5,0" Style="{StaticResource TimePickerStyle}" />
3741

3842
<StackPanel HorizontalAlignment="Center" Margin="0,5,0,0" Orientation="Horizontal" >
3943
<RadioButton x:Uid="silent" MinWidth="0" Width="Auto" Opacity="0.85" x:Name="rbs" Content="Silent" IsChecked="True" GroupName="not" />
4044
<RadioButton x:Uid="notify" MinWidth="0" Margin="30" Width="Auto" Opacity="0.85" x:Name="rbn" Content="Notify" GroupName="not" />
4145
<RadioButton x:Uid="alarm" MinWidth="0" Width="Auto" Opacity="0.85" x:Name="rba" Content="Alarm" GroupName="not" />
4246
</StackPanel>
4347
</StackPanel>
44-
48+
4549
<!--<Controls:Expander x:Name="Expander4" VerticalAlignment="Top" Margin="0,10,0,10"
4650
Header="Deadline"
4751
IsExpanded="False">
@@ -53,29 +57,13 @@
5357
</StackPanel>
5458
</ScrollViewer>
5559

60+
<StackPanel HorizontalAlignment="Center" Grid.Row="1" Orientation="Horizontal">
61+
<Button HorizontalAlignment="Stretch" Click="AppBarButton_Click" Width="160" Background="{StaticResource RedBrush}" Content="Dismiss" Margin="5,5" Height="45" Style="{StaticResource goitstyle}"/>
62+
<Button HorizontalAlignment="Stretch" Click="AppBarButton_Click_1" Width="160" Background="{StaticResource GreenBrush}" Content="Save" Margin="5,5" Height="45" Style="{StaticResource goitstyle}"/>
63+
</StackPanel>
5664
</Grid>
5765

58-
<CommandBar VerticalAlignment="Bottom">
59-
<AppBarButton Width="Auto" MinWidth="70" Label="Cancel" Click="AppBarButton_Click" >
60-
61-
<AppBarButton.Icon>
62-
<FontIcon Margin="0,-14,0,-15" FontFamily="Segoe MDL2 Assets" Glyph="" Height="49" VerticalAlignment="Top"/>
63-
</AppBarButton.Icon>
64-
</AppBarButton>
65-
66-
<AppBarButton Width="Auto" MinWidth="70" Label="Save" Click="AppBarButton_Click_1" >
67-
68-
<AppBarButton.Icon>
69-
<FontIcon Margin="0,-14,0,-15" FontFamily="Segoe MDL2 Assets" Glyph="" Height="49" VerticalAlignment="Top"/>
70-
</AppBarButton.Icon>
71-
</AppBarButton>
72-
73-
74-
75-
76-
7766

78-
</CommandBar>
7967
<VisualStateManager.VisualStateGroups>
8068
<VisualStateGroup x:Name="WindowStates">
8169
<VisualState x:Name="Wide3State">

Denna/Denna/Views/SubMaster/Add/Task.xaml.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ public Task()
2626

2727
void AppBarButton_Click_1(object sender, RoutedEventArgs e)
2828
{
29+
Title.Focus(FocusState.Programmatic);
30+
Details.Focus(FocusState.Programmatic);
2931
var start = new DateTime(datepic.Date.Year, datepic.Date.Month, datepic.Date.Day, timepic.Time.Hours, timepic.Time.Minutes, timepic.Time.Seconds);
3032
int notiftStatus = 0;
3133
if (rbs.IsChecked == true)

0 commit comments

Comments
 (0)