diff --git a/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb b/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb index 72735534..b36f08b3 100644 --- a/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb +++ b/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb @@ -11,6 +11,20 @@ Imports EgtWPFLib5 Public Class EgtDataGrid + ' vecchio indice da salvare per il Reorder delle colonne + Public OldIndex As Integer = 0 + + ' variabili e costanti per il Resize delle colonne adiacenti + Private Const LEFT As String = "PART_LeftHeaderGripper" + Private Const RIGHT As String = "PART_RightHeaderGripper" + Private startPoint As Point + Private startWidth As Double + Private adjacentStartWidth As Double + 'Private startUnitType As DataGridLengthUnitType + 'Private adjacentUnitType As DataGridLengthUnitType + Private targetColumn As DataGridColumn + Private adjacentColumn As DataGridColumn + Sub New() InitializeComponent() End Sub @@ -182,8 +196,6 @@ Public Class EgtDataGrid cm.IsOpen = True End Sub - Public OldIndex As Integer = 0 - Private Sub CurrDataGrid_ColumnReordering(sender As Object, e As DataGridColumnEventArgs) Handles CurrDataGrid.ColumnReordering ' conservo il vecchio indice in modo da effettuare lo scambio in BindingColumns una volta riordinate graficamente OldIndex = e.Column.DisplayIndex @@ -202,25 +214,15 @@ Public Class EgtDataGrid Next End Sub - Private Const LEFT As String = "PART_LeftHeaderGripper" - Private Const RIGHT As String = "PART_RightHeaderGripper" - Private startPoint As Point - Private startWidth As Double - Private adjacentStartWidth As Double - 'Private startUnitType As DataGridLengthUnitType - 'Private adjacentUnitType As DataGridLengthUnitType - Private targetColumn As DataGridColumn - Private adjacentColumn As DataGridColumn - Private Sub DataGridColumnHeader_Loaded(sender As Object, e As RoutedEventArgs) Dim header = DirectCast(sender, DataGridColumnHeader) Dim thumbLeft As Thumb = header.Template.FindName(LEFT, header) - thumbLeft.AddHandler(Thumb.DragStartedEvent, CType(AddressOf Thumb_DragStarted, DragStartedEventHandler), True) ' thumbLeft.AddHandler(Thumb.DragStartedEvent, New DragStartedEventHandler(AddressOf Thumb_DragStarted), True) + thumbLeft.AddHandler(Thumb.DragStartedEvent, CType(AddressOf Thumb_DragStarted, DragStartedEventHandler), True) thumbLeft.AddHandler(Thumb.DragCompletedEvent, CType(AddressOf Thumb_DragCompleted, DragCompletedEventHandler), True) Dim thumbRight As Thumb = header.Template.FindName(RIGHT, header) - thumbRight.AddHandler(Thumb.DragStartedEvent, CType(AddressOf Thumb_DragStarted, DragStartedEventHandler), True) ' thumbRight.AddHandler(Thumb.DragStartedEvent, New DragStartedEventHandler(AddressOf Thumb_DragStarted), True) + thumbRight.AddHandler(Thumb.DragStartedEvent, CType(AddressOf Thumb_DragStarted, DragStartedEventHandler), True) thumbRight.AddHandler(Thumb.DragCompletedEvent, CType(AddressOf Thumb_DragCompleted, DragCompletedEventHandler), True) End Sub diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml index 48149272..29904ebe 100644 --- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml +++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml @@ -65,7 +65,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="5" BindingColumns="{Binding ProjectColumns}"> diff --git a/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageV.xaml b/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageV.xaml index 1ba577a1..76155c07 100644 --- a/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageV.xaml +++ b/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageV.xaml @@ -243,7 +243,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="5" BindingColumns="{Binding VariablesColumns}"> diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListV.xaml index 34cec1b2..1152d39b 100644 --- a/EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListV.xaml +++ b/EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListV.xaml @@ -22,7 +22,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" BindingColumns="{Binding FeatureInPartInRawPartColumns}" Style="{StaticResource DataGrid_CustomHighLight}"> diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml index 71a03a42..1885e3c2 100644 --- a/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml +++ b/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml @@ -15,7 +15,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" BindingColumns="{Binding PartInRawPartColumns}" Style="{StaticResource DataGrid_CustomHighLight}"> diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml index d7991674..25f86cc6 100644 --- a/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml +++ b/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml @@ -14,7 +14,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" BindingColumns="{Binding RawPartColumns}" Style="{StaticResource DataGrid_CustomHighLight}"> diff --git a/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml b/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml index 5f0c602f..1389cef9 100644 --- a/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml +++ b/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml @@ -17,7 +17,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" BindingColumns="{Binding MDICommandColumns}" Style="{StaticResource DataGrid_CustomHighLight}"> diff --git a/EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml index adfa21c5..b2c8e708 100644 --- a/EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml @@ -23,7 +23,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="False" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="5" BindingColumns="{Binding SectXMatColumns}"> diff --git a/EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/BeamMachiningsWindowV.xaml b/EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/BeamMachiningsWindowV.xaml index ebe3e659..d9e60e43 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/BeamMachiningsWindowV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/BeamMachiningsWindowV.xaml @@ -33,7 +33,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" BindingColumns="{Binding BeamMachiningsColumns}"> diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListV.xaml index 80a16122..68aa5481 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListV.xaml @@ -19,7 +19,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" BindingColumns="{Binding FeatureInPartInRawPartColumns}" BeginningEdit="FeatureInPartInRawPartList_BeginningEdit" diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PParameterListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PParameterListV.xaml index 13d14cb3..85bc9c66 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PParameterListV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PParameterListV.xaml @@ -11,7 +11,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" ItemsSource="{Binding Tag.PBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PParameterListV}}}" SelectedItem="{Binding Tag.SelPBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PParameterListV}}}" diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml index 40cf3157..164769a6 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml @@ -15,7 +15,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" BindingColumns="{Binding PartInRawPartColumns}" BeginningEdit="PartInRawPartList_BeginningEdit" diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParamListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParamListV.xaml index 370ae2ba..b4af8f1c 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParamListV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParamListV.xaml @@ -96,7 +96,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5"> diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParameterListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParameterListV.xaml index fdee02f5..4b0d18a3 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParameterListV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParameterListV.xaml @@ -11,7 +11,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" ItemsSource="{Binding Tag.QBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListV}}}" SelectedItem="{Binding Tag.SelQBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListV}}}" diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml index 010612f8..7b383be5 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml @@ -14,7 +14,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" BindingColumns="{Binding RawPartColumns}" BeginningEdit="RawPartList_BeginningEdit" diff --git a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndV.xaml index eec04b70..57291e61 100644 --- a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndV.xaml @@ -136,7 +136,7 @@ SelectionMode="Single" ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" - ScrollViewer.HorizontalScrollBarVisibility="Hidden" + ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="5" BindingColumns="{Binding SParamColumns}">