diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-09-23 10:18:08 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-09-23 10:18:08 +0300 |
| commit | d6974df76b1401f101ca3c7fc3182f73e493ca51 (patch) | |
| tree | eb0d6373d7edd84224bf91c25b0da3fcede41c03 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml | |
| parent | cd5a926df30ea7e7a4f4f4a55d71b43ec7aee3e1 (diff) | |
| parent | 31f6935ac607a3767fa391d87deed6d2c2a300b7 (diff) | |
| download | Tango-d6974df76b1401f101ca3c7fc3182f73e493ca51.tar.gz Tango-d6974df76b1401f101ca3c7fc3182f73e493ca51.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml index f81ce804e..50f6a6297 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml @@ -147,7 +147,17 @@ <ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="260"></ColumnDefinition> </Grid.ColumnDefinitions> - <local:ColorConversionView x:Name="colorConversionView" Margin="0 0 0 0" Grid.Column="0" DataContext="{Binding ColorConversionViewVM}"/> + <DockPanel> + <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5"> + <Border.Effect> + <DropShadowEffect Opacity="0.4" /> + </Border.Effect> + <Grid> + <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">COLOR CONVERSION</TextBlock> + </Grid> + </Border> + <local:ColorConversionView x:Name="colorConversionView" Margin="0 0 0 0" Grid.Column="0" DataContext="{Binding ColorConversionViewVM}"/> + </DockPanel> <DockPanel Grid.Column="1"> <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="16 0" Padding="5" CornerRadius="5"> <Border.Effect> @@ -189,7 +199,6 @@ </Grid> </DockPanel> </Grid> - <!--<local:ColorConversionView x:Name="colorConversionView" />--> </TabItem> </TabControl> </Grid> |