EgtCAM5 :

- Migliorie varie.

ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml

@@ -15,10 +15,13 @@
          </StackPanel.Style>
          <TextBlock Text="{Binding TextBlock}"/>
          <TextBox Text="{Binding TextBox}"/>
-         <CheckBox Content="{Binding CheckBoxText}" IsChecked="{Binding IsChecked}"/>
-         <ComboBox ItemsSource="{Binding ComboItemsList}" SelectedIndex="{Binding ComboSelectedIndex}"/>
+         <CheckBox Content="{Binding CheckBoxText}" IsChecked="{Binding IsChecked}"
+                   Visibility="{Binding CheckVisibility}"/>
+         <ComboBox ItemsSource="{Binding ComboItemsList}" SelectedIndex="{Binding ComboSelectedIndex}"
+                   Visibility="{Binding ComboVisibility}"/>
          <UniformGrid>
-            <Button Command="{Binding}" Visibility="{Binding ShowVisibility}" Content="Show" Style="{StaticResource EgtCAM5_Button}"/>
+            <Button Command="{Binding}" Visibility="{Binding ShowVisibility}" Content="Show"
+                    Style="{StaticResource EgtCAM5_Button}"/>
             <Button Command="{Binding DoneCommand}" Content="Done" Style="{StaticResource EgtCAM5_Button}"/>
          </UniformGrid>
       </StackPanel>

ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderViewModel.vb

@@ -102,6 +102,19 @@ Namespace EgtCAM5
          End Set
       End Property
 
+      Private m_CheckVisibility As Visibility
+      Public Property CheckVisibility As Visibility
+         Get
+            Return m_CheckVisibility
+         End Get
+         Set(value As Visibility)
+            If value <> m_CheckVisibility Then
+               m_CheckVisibility = value
+               OnPropertyChanged("CheckVisibility")
+            End If
+         End Set
+      End Property
+
       ' ComboBox fields
       Private m_ComboItemsList As ObservableCollection(Of String)
       Public Property ComboItemsList As ObservableCollection(Of String)
@@ -128,13 +141,26 @@ Namespace EgtCAM5
          End Set
       End Property
 
+      Private m_ComboVisibility As Visibility
+      Public Property ComboVisibility As Visibility
+         Get
+            Return m_ComboVisibility
+         End Get
+         Set(value As Visibility)
+            If value <> m_ComboVisibility Then
+               m_ComboVisibility = value
+               OnPropertyChanged("ComboVisibility")
+            End If
+         End Set
+      End Property
+
       ' Buttons fields
-      Private m_ShowBtnVisibility As Boolean
-      Public Property ShowBtnVisibility As Boolean
+      Private m_ShowBtnVisibility As Visibility
+      Public Property ShowBtnVisibility As Visibility
          Get
             Return m_ShowBtnVisibility
          End Get
-         Set(value As Boolean)
+         Set(value As Visibility)
             m_ShowBtnVisibility = value
             OnPropertyChanged("ShowBtnVisibility")
          End Set
@@ -248,12 +274,14 @@ Namespace EgtCAM5
          TextBox = ""
          If PrepareInputBoxParam.sCheckLabel <> "" Then
             CheckBoxText = PrepareInputBoxParam.sCheckLabel
+            CheckVisibility = Visibility.Visible
          End If
          If PrepareInputBoxParam.bShowCombo Then
             ComboItemsList.Clear()
+            ComboVisibility = Visibility.Visible
          End If
          If PrepareInputBoxParam.bShowBtn Then
-            ShowBtnVisibility = True
+            ShowBtnVisibility = Visibility.Visible
          End If
          FocusTextBox = True
       End Sub
@@ -261,6 +289,9 @@ Namespace EgtCAM5
 
       Private Sub ResetInputBox()
          Title = "Drawing Parameters"
+         CheckVisibility = Visibility.Hidden
+         ComboVisibility = Visibility.Hidden
+         ShowBtnVisibility = Visibility.Hidden
          IsExpanded = False
          IsEnabled = False
       End Sub