Skip to content

Commit d14bb26

Browse files
retailcoderretailcoder
committed
treeview/scrollviewer fix
1 parent ca4d888 commit d14bb26

File tree

1 file changed

+36
-37
lines changed

1 file changed

+36
-37
lines changed

‎RetailCoder.VBE/UI/RegexAssistant/RegexAssistant.xaml

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -52,47 +52,46 @@
5252

5353
</UserControl.Resources>
5454

55-
<Grid>
56-
<ScrollViewer VerticalContentAlignment="Stretch">
57-
<StackPanel Margin="5">
58-
59-
<GroupBox>
60-
<GroupBox.Header>
61-
<Label Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=RegexAssistant_RegexPatternLabel}"
62-
FontWeight="SemiBold" />
63-
</GroupBox.Header>
55+
<Grid Margin="5">
56+
57+
<Grid.RowDefinitions>
58+
<RowDefinition Height="Auto" />
59+
<RowDefinition Height="*" MinHeight="180"/>
60+
</Grid.RowDefinitions>
6461

65-
<StackPanel>
66-
<TextBox HorizontalAlignment="Stretch"
67-
VerticalAlignment="Top" Height="23"
68-
VerticalContentAlignment="Center" Margin="5"
69-
Text="{Binding Pattern}"/>
62+
<GroupBox Grid.Row="0">
63+
<GroupBox.Header>
64+
<Label Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=RegexAssistant_RegexPatternLabel}" FontWeight="SemiBold" />
65+
</GroupBox.Header>
7066

71-
<StackPanel Orientation="Horizontal" Margin="5,0,5,0">
72-
<CheckBox Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=RegexAssistant_GlobalFlag}"
73-
IsChecked="{Binding GlobalFlag}"
74-
Margin="0,0,5,0"/>
75-
<CheckBox Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=RegexAssistant_IgnoreCaseFlag}"
76-
IsChecked="{Binding IgnoreCaseFlag}"
77-
Margin="0,0,5,0"/>
78-
</StackPanel>
79-
</StackPanel>
67+
<StackPanel>
68+
<TextBox HorizontalAlignment="Stretch"
69+
VerticalAlignment="Top" Height="23"
70+
VerticalContentAlignment="Center" Margin="5"
71+
Text="{Binding Pattern}"/>
8072

81-
</GroupBox>
73+
<StackPanel Orientation="Horizontal" Margin="5,0,5,0">
74+
<CheckBox Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=RegexAssistant_GlobalFlag}"
75+
IsChecked="{Binding GlobalFlag}"
76+
Margin="0,0,5,0"/>
77+
<CheckBox Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=RegexAssistant_IgnoreCaseFlag}"
78+
IsChecked="{Binding IgnoreCaseFlag}"
79+
Margin="0,0,5,0"/>
80+
</StackPanel>
81+
</StackPanel>
82+
</GroupBox>
8283

83-
<GroupBox Margin="5" MinHeight="200">
84-
<GroupBox.Header>
85-
<Label Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=RegexAssistant_DescriptionResultsLabel}" FontWeight="SemiBold" />
86-
</GroupBox.Header>
84+
<GroupBox Grid.Row="1" Margin="5">
85+
<GroupBox.Header>
86+
<Label Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=RegexAssistant_DescriptionResultsLabel}" FontWeight="SemiBold" />
87+
</GroupBox.Header>
8788

88-
<TreeView ItemTemplate="{StaticResource RecursiveData}"
89-
ItemContainerStyle="{StaticResource ShinyTreeView}"
90-
Margin="5"
91-
VerticalAlignment="Stretch"
92-
HorizontalContentAlignment="Stretch"
93-
ItemsSource="{Binding ResultItems}" />
94-
</GroupBox>
95-
</StackPanel>
96-
</ScrollViewer>
89+
<TreeView Margin="5"
90+
ScrollViewer.VerticalScrollBarVisibility="Auto"
91+
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
92+
ItemTemplate="{StaticResource RecursiveData}"
93+
ItemContainerStyle="{StaticResource ShinyTreeView}"
94+
ItemsSource="{Binding ResultItems}"/>
95+
</GroupBox>
9796
</Grid>
9897
</UserControl>

0 commit comments

Comments
 (0)