From 338edba081dba2a2aefb634811be1cc84ec93d64 Mon Sep 17 00:00:00 2001
From: Avi Levkovich <avi@twine-s.com>
Date: Tue, 25 Aug 2020 10:08:01 +0300
Subject: merge

---
 .../Views/MainView.xaml                            | 31 +++++++++-------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml
index e2d65d7a3..40e282712 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml
@@ -4,14 +4,14 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:local="clr-namespace:Tango.MachineStudio.ActionLogs.Views"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:vm="clr-namespace:Tango.MachineStudio.ActionLogs.ViewModels"
              xmlns:global="clr-namespace:Tango.MachineStudio.ActionLogs"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf;assembly=MaterialDesignThemes.Wpf"
              xmlns:diff="clr-namespace:Tango.BL.ValueObjects;assembly=Tango.BL"
+             xmlns:local="clr-namespace:Tango.MachineStudio.ActionLogs.Views"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <UserControl.Resources>
@@ -60,7 +60,7 @@
                             </StackPanel>
                             <DockPanel  Margin="50 0 0 0" >
                                 <TextBlock DockPanel.Dock="Top" Text="Action Log Type:" VerticalAlignment="Center" FontSize="10"></TextBlock>
-                                <ToggleButton Width="200" Margin="0 5 0 0" x:Name="selectActionsButton">
+                                <ToggleButton Width="200" Margin="0 5 0 0" x:Name="selectActionsButton" >
                                     <ToggleButton.Template>
                                         <ControlTemplate>
                                             <Grid>
@@ -75,21 +75,16 @@
                                                         </TextBlock>
                                                     </DockPanel>
                                                 </Border>
-                                                <Popup StaysOpen="False" IsOpen="{Binding RelativeSource={RelativeSource AncestorType=ToggleButton},Path=IsChecked }" >
-                                                    <Border Padding="5" Background="{DynamicResource ComboBox.Floating.Background}" BorderBrush="{StaticResource AutoCompleteTextBox.Popup.BorderBrush}">
-                                                        <ScrollViewer MaxHeight="600" Background="{DynamicResource ComboBox.Floating.Background}">
-                                                            <ItemsControl ItemsSource="{Binding SelectedActionLogTypes}"  Foreground="{StaticResource MainWindow.Foreground}">
-                                                                <ItemsControl.ItemTemplate>
-                                                                    <DataTemplate>
-                                                                        <DockPanel Margin="2">
-                                                                            <CheckBox VerticalAlignment="Center" DockPanel.Dock="Left" IsChecked="{Binding IsSelected}" >
-                                                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" Text="{Binding Data,Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
-                                                                            </CheckBox>
-                                                                        </DockPanel>
-                                                                    </DataTemplate>
-                                                                </ItemsControl.ItemTemplate>
-                                                            </ItemsControl>
-                                                        </ScrollViewer>
+                                                <Popup StaysOpen="False" IsOpen="{Binding RelativeSource={RelativeSource AncestorType=ToggleButton},Path=IsChecked }"  Style="{x:Null}">
+                                                    <Border Padding="5" MaxHeight="600" Background="{DynamicResource ComboBox.Floating.Background}" BorderBrush="{StaticResource AutoCompleteTextBox.Popup.BorderBrush}" MinWidth="{Binding RelativeSource={RelativeSource AncestorType=ToggleButton},Path=ActualWidth}">
+                                                        <controls:AllSelectedCheckboxList Style="{StaticResource AllSelectedCheckBoxListStyle}" MaxHeight="600" ItemsSource="{Binding SelectedActionLogTypes}"  Foreground="{StaticResource MainWindow.Foreground}" Background="{DynamicResource ComboBox.Floating.Background}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SelectionMode="Multiple" AllSelected="True" >
+                                                            <controls:AllSelectedCheckboxList.ItemTemplate>
+                                                                <DataTemplate >
+                                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" Text="{Binding Data,Converter={StaticResource EnumToDescriptionConverter}}"/>
+
+                                                                </DataTemplate>
+                                                            </controls:AllSelectedCheckboxList.ItemTemplate>
+                                                        </controls:AllSelectedCheckboxList>
                                                     </Border>
                                                 </Popup>
                                             </Grid>
-- 
cgit v1.3.1