Skip to content

Commit d1badcc

Browse files
committed
Fixed hiding UI detail display with empty list
1 parent ed18bd7 commit d1badcc

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@
153153
<ColumnDefinition Width="*" />
154154
</Grid.ColumnDefinitions>
155155
<StackPanel>
156-
<GroupBox Grid.Column="0"
156+
<GroupBox Visibility="{Binding Path=IsEmptyList, Converter={StaticResource BoolToHiddenVisibility}}"
157+
Grid.Column="0"
157158
Margin="5,0,0,5"
158159
MaxHeight="125"
159160
MinHeight="75"

Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldViewModel.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public ObservableCollection<IEncapsulatedFieldViewData> EncapsulationFields
107107
orderedFields = Model.EncapsulationCandidates.Where(ec => !_selectedObjectStateUDT.FieldIdentifier.Equals(ec.IdentifierName))
108108
.OrderBy(efd => efd.Declaration.Selection).ToList();
109109
}
110+
IsEmptyList = orderedFields.Count() == 0;
110111
foreach (var efd in orderedFields)
111112
{
112113
viewableFields.Add(new ViewableEncapsulatedField(efd));
@@ -116,6 +117,8 @@ public ObservableCollection<IEncapsulatedFieldViewData> EncapsulationFields
116117
}
117118
}
118119

120+
public bool IsEmptyList { set; get; }
121+
119122
public ObservableCollection<IObjectStateUDT> UDTFields
120123
{
121124
get
@@ -269,10 +272,9 @@ public bool IsReadOnly
269272

270273
public bool ConvertFieldsToUDTMembers
271274
{
272-
get => Model.EncapsulateFieldStrategy == EncapsulateFieldStrategy.ConvertFieldsToUDTMembers; // Model.ConvertFieldsToUDTMembers;
275+
get => Model.EncapsulateFieldStrategy == EncapsulateFieldStrategy.ConvertFieldsToUDTMembers;
273276
set
274277
{
275-
//Model.ConvertFieldsToUDTMembers = value;
276278
Model.EncapsulateFieldStrategy = value
277279
? EncapsulateFieldStrategy.ConvertFieldsToUDTMembers
278280
: EncapsulateFieldStrategy.UseBackingFields;

0 commit comments

Comments
 (0)