diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml')
| -rw-r--r-- | Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml index dd405a6c3..2b35a5ede 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml @@ -43,44 +43,6 @@ <!--</local:TouchNotificationBar>--> </DockPanel> - <!--Dialogs--> - <Grid> - <Grid.Style> - <Style TargetType="Grid"> - <!--<Setter Property="Opacity" Value="0"></Setter>--> - <Setter Property="Visibility" Value="Hidden"></Setter> - <Style.Triggers> - <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=HasDialog}" Value="True"> - <Setter Property="Visibility" Value="Visible"></Setter> - <!--<DataTrigger.EnterActions> - <BeginStoryboard> - <Storyboard> - <DoubleAnimation To="1" Storyboard.TargetProperty="Opacity" Duration="00:00:0.2" /> - </Storyboard> - </BeginStoryboard> - </DataTrigger.EnterActions>--> - </DataTrigger> - </Style.Triggers> - </Style> - </Grid.Style> - - <Grid Background="#9E000000" x:Name="PART_gridDialogsMask"> - <!--<i:Interaction.Triggers> - <i:EventTrigger EventName="MouseUp"> - <i:InvokeCommandAction Command="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentDialog.DataContext.CloseCommand}" /> - </i:EventTrigger> - </i:Interaction.Triggers>--> - </Grid> - - <Border Background="{StaticResource TangoPrimaryBackgroundBrush}" CornerRadius="5" Padding="10" HorizontalAlignment="Center" VerticalAlignment="Center"> - <Border.Effect> - <DropShadowEffect BlurRadius="10" /> - </Border.Effect> - - <ContentPresenter Content="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentDialog}" /> - </Border> - </Grid> - <!--Combo Box PopUp--> <Grid Background="#9E000000" x:Name="PART_combobox_grid"> <Grid.Style> @@ -169,6 +131,44 @@ </Grid> </Grid> + <!--Dialogs--> + <Grid> + <Grid.Style> + <Style TargetType="Grid"> + <!--<Setter Property="Opacity" Value="0"></Setter>--> + <Setter Property="Visibility" Value="Hidden"></Setter> + <Style.Triggers> + <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=HasDialog}" Value="True"> + <Setter Property="Visibility" Value="Visible"></Setter> + <!--<DataTrigger.EnterActions> + <BeginStoryboard> + <Storyboard> + <DoubleAnimation To="1" Storyboard.TargetProperty="Opacity" Duration="00:00:0.2" /> + </Storyboard> + </BeginStoryboard> + </DataTrigger.EnterActions>--> + </DataTrigger> + </Style.Triggers> + </Style> + </Grid.Style> + + <Grid Background="#9E000000"> + <i:Interaction.Triggers> + <i:EventTrigger EventName="MouseDown"> + <i:InvokeCommandAction Command="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentDialog.DataContext.CloseCommand}" /> + </i:EventTrigger> + </i:Interaction.Triggers> + </Grid> + + <Border Background="{StaticResource TangoPrimaryBackgroundBrush}" CornerRadius="5" Padding="10" HorizontalAlignment="Center" VerticalAlignment="Center"> + <Border.Effect> + <DropShadowEffect BlurRadius="10" /> + </Border.Effect> + + <ContentPresenter Content="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentDialog}" /> + </Border> + </Grid> + <!--Messages--> <Grid Background="#9E000000"> <Grid.Style> @@ -242,7 +242,7 @@ <local:TouchButton x:Name="btnOK" FontWeight="Normal" Width="220" CornerRadius="25" FontSize="{StaticResource TangoMessageBoxButtonFontSize}" Margin="30 0 0 0" Style="{StaticResource TangoHollowButton}" Command="{Binding OKCommand}">OK</local:TouchButton> </StackPanel> - <TextBlock FontSize="{StaticResource TangoMessageBoxMessageFontSize}" Text="{Binding Message}" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap" Margin="10 0"></TextBlock> + <TextBlock FontSize="{StaticResource TangoMessageBoxMessageFontSize}" Text="{Binding Message}" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap"></TextBlock> </DockPanel> </Grid> @@ -263,7 +263,7 @@ </Style> </Grid.Style> - <Grid MinHeight="390" Margin="20" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Center"> + <Grid Height="360" Margin="20" RenderTransformOrigin="0.5,0.5"> <Grid.Style> <Style TargetType="Grid"> <Setter Property="RenderTransform"> |