From b11d009195f5f9b5302f3065f75d6e2bf40fc762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?= Date: Mon, 14 Feb 2022 12:07:17 +0100 Subject: [PATCH] Item name "..." --- src/GuiApp/FileTime.Avalonia/App.axaml | 4 + .../Converters/NamePartShrinkerConverter.cs | 119 ++++++++++++++++++ .../FileTime.Avalonia.csproj | 1 + .../FileTime.Avalonia/Models/ItemNamePart.cs | 12 +- .../Services/CommandHandlerService.cs | 6 + .../Services/ItemNameConverterService.cs | 2 +- .../ViewModels/ItemNamePartViewModel.cs | 16 +++ .../ViewModels/MainPageViewModel.cs | 16 +++ .../FileTime.Avalonia/Views/ItemView.axaml | 23 +++- .../FileTime.Avalonia/Views/MainWindow.axaml | 7 +- .../Views/MainWindow.axaml.cs | 6 - 11 files changed, 188 insertions(+), 24 deletions(-) create mode 100644 src/GuiApp/FileTime.Avalonia/Converters/NamePartShrinkerConverter.cs create mode 100644 src/GuiApp/FileTime.Avalonia/ViewModels/ItemNamePartViewModel.cs diff --git a/src/GuiApp/FileTime.Avalonia/App.axaml b/src/GuiApp/FileTime.Avalonia/App.axaml index 5043341..ee6a840 100644 --- a/src/GuiApp/FileTime.Avalonia/App.axaml +++ b/src/GuiApp/FileTime.Avalonia/App.axaml @@ -135,6 +135,7 @@ + @@ -158,11 +159,14 @@ + HorizontalAlignment="Stretch"> + + + + + + + + @@ -42,7 +52,8 @@ - @@ -52,6 +63,7 @@ @@ -59,6 +71,7 @@ diff --git a/src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml b/src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml index a5ef93b..54b7947 100644 --- a/src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml +++ b/src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml @@ -27,7 +27,7 @@ - + @@ -249,13 +249,12 @@ IsTabStop="True" Items="{Binding AppState.SelectedTab.CurrentLocation.Items^}" ScrollViewer.HorizontalScrollBarVisibility="Hidden" - ScrollViewer.VerticalScrollBarVisibility="Hidden" + ScrollViewer.VerticalScrollBarVisibility="Visible" SelectedItem="{Binding AppState.SelectedTab.SelectedItem, Mode=TwoWay}" - SelectionChanged="OnCurrentItemsSelectionChanged" Classes="ContentListView"> - + diff --git a/src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml.cs b/src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml.cs index 473ba9e..7949132 100644 --- a/src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml.cs +++ b/src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml.cs @@ -154,11 +154,5 @@ namespace FileTime.Avalonia.Views BeginMoveDrag(e); } } - - private void OnCurrentItemsSelectionChanged(object sender, SelectionChangedEventArgs e) - { - var listBox = this.FindControl("CurrentItems"); - listBox.ScrollIntoView(listBox.SelectedIndex); - } } } \ No newline at end of file