mikx
/
Filtration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed section browser

This commit is contained in:
Ben Wallis 2017-12-07 21:36:42 +00:00
parent b88730fb3a
commit 523a9553d9
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Filtration/Filtration.csproj
View File

@ -196,7 +196,7 @@
<Compile Include="UserControls\ThemeComponentSelectionControl.xaml.cs"> <Compile Include="UserControls\ThemeComponentSelectionControl.xaml.cs">
<DependentUpon>ThemeComponentSelectionControl.xaml</DependentUpon> <DependentUpon>ThemeComponentSelectionControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Utility\RoutedCommandHandler.cs" /> <Compile Include="Utility\RoutedCommandHandler.cs" />
<Compile Include="Utility\RoutedCommandHandlers.cs" /> <Compile Include="Utility\RoutedCommandHandlers.cs" />
<Compile Include="ViewModels\AvalonDockWorkspaceViewModel.cs" /> <Compile Include="ViewModels\AvalonDockWorkspaceViewModel.cs" />
<Compile Include="ViewModels\Factories\IItemFilterCommentBlockViewModelFactory.cs" /> <Compile Include="ViewModels\Factories\IItemFilterCommentBlockViewModelFactory.cs" />
@ -250,7 +250,7 @@
<Compile Include="UserControls\NumericFilterPredicateControl.xaml.cs"> <Compile Include="UserControls\NumericFilterPredicateControl.xaml.cs">
<DependentUpon>NumericFilterPredicateControl.xaml</DependentUpon> <DependentUpon>NumericFilterPredicateControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Views\ItemFilterCommentBlockView.xaml.cs"> <Compile Include="Views\ItemFilterCommentBlockView.xaml.cs">
<DependentUpon>ItemFilterCommentBlockView.xaml</DependentUpon> <DependentUpon>ItemFilterCommentBlockView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Views\AboutWindow.xaml.cs"> <Compile Include="Views\AboutWindow.xaml.cs">
@ -268,6 +268,9 @@
<Compile Include="Views\StartPageView.xaml.cs"> <Compile Include="Views\StartPageView.xaml.cs">
<DependentUpon>StartPageView.xaml</DependentUpon> <DependentUpon>StartPageView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Views\ToolPanes\CommentBlockBrowserView.xaml.cs">
<DependentUpon>CommentBlockBrowserView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\UpdateAvailableView.xaml.cs"> <Compile Include="Views\UpdateAvailableView.xaml.cs">
<DependentUpon>UpdateAvailableView.xaml</DependentUpon> <DependentUpon>UpdateAvailableView.xaml</DependentUpon>
</Compile> </Compile>
@ -327,7 +330,7 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Views\ToolPanes\CommentBlockBrowserView.xaml"> <Page Include="Views\ToolPanes\CommentBlockBrowserView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
@ -339,7 +342,7 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Views\ItemFilterCommentBlockView.xaml"> <Page Include="Views\ItemFilterCommentBlockView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>

6
Filtration/UserControls/AutoScrollingListBox.cs
View File

@ -5,6 +5,12 @@ namespace Filtration.UserControls
{ {
public class AutoScrollingListBox : ListBox public class AutoScrollingListBox : ListBox
{ {
protected override void OnSelectionChanged(SelectionChangedEventArgs e)
{
ScrollIntoView(e.AddedItems[0]);
base.OnSelectionChanged(e);
}
protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e) protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
{ {
if (e.NewItems == null) return; if (e.NewItems == null) return;

2
Filtration/ViewModels/ToolPanes/CommentBlockBrowserViewModel.cs
View File

@ -24,7 +24,7 @@ namespace Filtration.ViewModels.ToolPanes
icon.UriSource = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/add_section_icon.png"); icon.UriSource = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/add_section_icon.png");
icon.EndInit(); icon.EndInit();
IconSource = icon; IconSource = icon;
Messenger.Default.Register<NotificationMessage>(this, message => Messenger.Default.Register<NotificationMessage>(this, message =>
{ {
switch (message.Notification) switch (message.Notification)

8
Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:converters="clr-namespace:Filtration.Converters" xmlns:converters="clr-namespace:Filtration.Converters"
xmlns:toolPanes="clr-namespace:Filtration.ViewModels.ToolPanes" xmlns:toolPanes="clr-namespace:Filtration.ViewModels.ToolPanes"
xmlns:viewModels="clr-namespace:Filtration.ViewModels"
d:DataContext="{d:DesignInstance Type=toolPanes:CommentBlockBrowserViewModel}" d:DataContext="{d:DesignInstance Type=toolPanes:CommentBlockBrowserViewModel}"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300"> d:DesignHeight="300" d:DesignWidth="300">
@ -13,14 +14,13 @@
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid>
<ListBox ItemsSource="{Binding ItemFilterCommentBlockViewModels}" <ListBox ItemsSource="{Binding ItemFilterCommentBlockViewModels}"
SelectedItem="{Binding SelectedItemFilterCommentBlockViewModel}" SelectedItem="{Binding SelectedItemFilterCommentBlockViewModel}"
x:Name="SectionBrowserListBox" ScrollViewer.HorizontalScrollBarVisibility="Hidden"><!--SelectionChanged="SectionBrowserListBox_OnSelectionChanged"-->
ScrollViewer.HorizontalScrollBarVisibility="Hidden"><!--SelectionChanged="SectionBrowserListBox_OnSelectionChanged"-->
<ListBox.Resources> <ListBox.Resources>
</ListBox.Resources> </ListBox.Resources>
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate DataType="viewModels:ItemFilterCommentBlockViewModel">
<TextBlock Text="{Binding Comment, Converter={StaticResource HashSignRemovalConverter}}" ToolTip="{Binding Comment}" /> <TextBlock Text="{Binding Comment, Converter={StaticResource HashSignRemovalConverter}}" ToolTip="{Binding Comment}" />
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>