diff options
| author | Roy <Roy.mail.net@gmail.com> | 2023-03-09 15:18:59 +0200 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2023-03-09 15:18:59 +0200 |
| commit | fa62f893d3971bb0b0559325d2742a151f524392 (patch) | |
| tree | 7bc24470f9d143dc1c1ff53c6d4964a8a2137ea7 /Software/Visual_Studio/PPC/Tango.PPC.UI/Views | |
| parent | a47bbe8211c4b7a02c6974cba017d77ea31ffc37 (diff) | |
| download | Tango-fa62f893d3971bb0b0559325d2742a151f524392.tar.gz Tango-fa62f893d3971bb0b0559325d2742a151f524392.zip | |
Layout fixes.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Views')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml | 20 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml index bc75ea258..d496d4d14 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml @@ -30,18 +30,18 @@ <Grid.ColumnDefinitions> <ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/> - <ColumnDefinition Width="65*"/> + <ColumnDefinition Width="Auto"/> </Grid.ColumnDefinitions> <Grid Background="{StaticResource TangoPrimaryBackgroundBrush}"> - <Viewbox Stretch="Fill" Width="230"> - <Grid Width="250"> - <Border TextElement.FontSize="16" Height="865" x:Name="border" BorderThickness="0 0 0 0" BorderBrush="{StaticResource TangoDarkForegroundBrush}" TextElement.Foreground="{StaticResource TangoDarkForegroundBrush}"> + <Viewbox Stretch="Fill" Width="350"> + <Grid Width="250" Height="900" > + <Border TextElement.FontSize="16" x:Name="border" BorderThickness="0 0 0 0" BorderBrush="{StaticResource TangoDarkForegroundBrush}" TextElement.Foreground="{StaticResource TangoDarkForegroundBrush}"> <Grid Background="{StaticResource TangoPrimaryBackgroundBrush}"> <StackPanel VerticalAlignment="Top"> <Border Background="{StaticResource TangoPrimaryBackgroundBrush}" BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 0"> <Grid> - <Border Background="{StaticResource TangoPrimaryBackgroundBrush}"> + <Border Height="82" Background="{StaticResource TangoPrimaryBackgroundBrush}"> <Border.Effect> <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" /> </Border.Effect> @@ -215,13 +215,15 @@ </Grid> </Grid> - <Grid Background="Gainsboro" Grid.Column="2"> - <local:MachineStatusView /> + <Grid Background="Gainsboro" Grid.Column="2" Width="1280" Height="1280"> + <!--<Viewbox>--> + <local:MachineStatusView /> + <!--</Viewbox>--> </Grid> <Grid Grid.Column="1" Background="{StaticResource TangoPrimaryBackgroundBrush}"> <Grid> - <Viewbox> + <!--<Viewbox>--> <touch:TouchPanelEureka Width="800" Height="1280" HasMessageBox="{Binding NotificationProvider.HasMessageBox}" CurrentMessageBox="{Binding NotificationProvider.CurrentMessageBox}" @@ -324,7 +326,7 @@ </DockPanel> </Grid> </touch:TouchPanelEureka> - </Viewbox> + <!--</Viewbox>--> </Grid> </Grid> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml index 43b85887b..0879fcaab 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -12,7 +12,7 @@ d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MachineStatusViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MachineStatusViewVM}"> <Grid Background="{StaticResource TangoMidBackgroundBrush}"> <DockPanel> - <Grid Panel.ZIndex="100" DockPanel.Dock="Top" Height="79" Background="{StaticResource TangoPrimaryBackgroundBrush}"> + <Grid Panel.ZIndex="100" DockPanel.Dock="Top" Height="117" Background="{StaticResource TangoPrimaryBackgroundBrush}"> <Grid.Effect> <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" /> </Grid.Effect> |