EgtCAM5 :
- Modificata behaviour che apre e chiude gli expander automaticamente. - Modificato calcolo dell'altezza massima dei parametri operazione di lavorazione. - Migliorie varie.
This commit is contained in:
+8
-7
@@ -6,6 +6,7 @@ Public Class OperationExpanderView
|
||||
Private EgtFloatingTray As EgtFloatingTray
|
||||
Private OptionPanelView As UserControl
|
||||
Private OptionPanelViewStackPanel As StackPanel
|
||||
'Private OperationParameters As ContentPresenter
|
||||
Private MachiningTreeContentPresenter As ContentPresenter
|
||||
Private MachiningTreeUserControl As UserControl
|
||||
Private MachiningTreeExpander As Expander
|
||||
@@ -72,13 +73,13 @@ Public Class OperationExpanderView
|
||||
OperationsListExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
|
||||
OccupiedHeight += (OperationsListExpander.ActualHeight - OperationsListExpanderContent.DesiredSize.Height)
|
||||
End If
|
||||
'If Not OperationParametersExpander.IsExpanded Then
|
||||
' OccupiedHeight += OperationParametersExpander.ActualHeight
|
||||
'Else
|
||||
' Dim OperationParametersExpanderContent As FrameworkElement = DirectCast(OperationParametersExpander.Content, FrameworkElement)
|
||||
' OperationParametersExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
|
||||
' OccupiedHeight += (OperationParametersExpander.ActualHeight - OperationParametersExpanderContent.DesiredSize.Height)
|
||||
'End If
|
||||
If Not OperationParametersExpander.IsExpanded Then
|
||||
OccupiedHeight += OperationParametersExpander.ActualHeight
|
||||
Else
|
||||
Dim OperationParametersExpanderContent As FrameworkElement = DirectCast(OperationParametersExpander.Content, FrameworkElement)
|
||||
OperationParametersExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
|
||||
OccupiedHeight += (OperationParametersExpander.ActualHeight - OperationParametersExpanderContent.DesiredSize.Height)
|
||||
End If
|
||||
'' Aggiungo altezza contenuto OperationParameters che però è fuori dallo Stackpanel
|
||||
'OperationFirstParametersStackPanel.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
|
||||
'If OperationFirstParametersStackPanel.DesiredSize.Height <> 0 Then
|
||||
|
||||
Reference in New Issue
Block a user