Skip to content

Commit a144691

Browse files
miclat97miclat97
committed
Starting file selection fix
Focus at files list fix Version upgrade to 1.5.0.3
1 parent 108420a commit a144691

File tree

4 files changed

+34
-27
lines changed

4 files changed

+34
-27
lines changed

‎QuickViewFile/MainWindow.xaml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
WindowStartupLocation="CenterScreen"
1313
KeyDown="AppWindow_KeyDown"
1414
MouseLeftButtonDown="Window_MouseLeftButtonDown"
15-
ResizeMode="CanResizeWithGrip"
1615
FocusManager.FocusedElement="{Binding ElementName=FilesListView}"
16+
ResizeMode="CanResizeWithGrip"
1717
Title="QuickViewFile" Height="720" Width="1280">
1818
<Window.Resources>
1919
<BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
@@ -54,10 +54,9 @@
5454
SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
5555
MouseDoubleClick="FilesListView_MouseDoubleClick"
5656
Margin="10"
57+
IsSynchronizedWithCurrentItem="True"
5758
KeyDown="AppWindow_KeyDown"
5859
ScrollViewer.PanningMode="VerticalFirst"
59-
Focusable="True"
60-
SelectedIndex="0"
6160
SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
6261
IsManipulationEnabled="True"
6362
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
@@ -94,7 +93,7 @@
9493
HorizontalAlignment="Stretch"
9594
Background="{DynamicResource {x:Static SystemColors.AccentColorBrushKey}}"
9695
VerticalAlignment="Stretch"
97-
Focusable="False" IsTabStop="False" HorizontalContentAlignment="Center" />
96+
HorizontalContentAlignment="Center" />
9897
<Border Name="ContentBorder"
9998
Grid.Column="2"
10099
BorderThickness="1"
@@ -115,13 +114,12 @@
115114

116115
<local:VideoPlayerControl
117116
KeyDown="AppWindow_KeyDown"
118-
Focusable="False"
119117
x:Name="VideoMedia"
120118
Content="{Binding SelectedItem.FileContentModel.VideoMedia}"
121119
Visibility="{Binding SelectedItem.FileContentModel.VideoMedia, Converter={StaticResource NullToCollapsedConverter}}" />
122120

123121

124-
<Grid Focusable="False"
122+
<Grid
125123
KeyDown="AppWindow_KeyDown"
126124
Visibility="{Binding SelectedItem.FileContentModel.ImageSource, Converter={StaticResource NullToCollapsedConverter}}"
127125
ClipToBounds="True">
@@ -147,7 +145,6 @@
147145
Name="TextBoxTextContent"
148146
HorizontalScrollBarVisibility="Auto"
149147
VerticalScrollBarVisibility="Auto"
150-
Focusable="True"
151148
Margin="10"
152149
ClipToBounds="True"
153150
Visibility="{Binding SelectedItem.FileContentModel.ShowTextBox, Converter={StaticResource BoolToVisibilityConverter}}"

‎QuickViewFile/MainWindow.xaml.cs‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,40 @@ namespace QuickViewFile
1111
public partial class MainWindow : Window
1212
{
1313
private bool _filesListViewVisible = true;
14+
1415
public MainWindow()
1516
{
1617
try
1718
{
19+
InitializeComponent();
20+
FilesListView.Focus();
21+
1822
string[] args = Environment.GetCommandLineArgs();
1923

2024
if (args.ElementAtOrDefault(1) is not null)
2125
{
22-
var vm = new FilesListViewModel(Path.Combine(args.ElementAt(1)));
23-
DataContext = vm;
26+
var fileToSelectFullPath = args.ElementAt(1);
27+
if (File.Exists(fileToSelectFullPath))
28+
{
29+
var vm = new FilesListViewModel(fileToSelectFullPath);
30+
DataContext = vm;
31+
}
2432
}
2533
else
2634
{
2735
var vm = new FilesListViewModel(Directory.GetCurrentDirectory());
2836
DataContext = vm;
37+
2938
}
30-
InitializeComponent();
3139
}
3240
catch
3341
{
3442
var vm = new FilesListViewModel(Directory.GetCurrentDirectory());
3543
DataContext = vm;
36-
InitializeComponent();
44+
}
45+
finally
46+
{
47+
FilesListView.Focus();
3748
}
3849
}
3950

‎QuickViewFile/QuickViewFile.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<UseWPF>true</UseWPF>
9-
<Version>1.5.0.2</Version>
9+
<Version>1.5.0.3</Version>
1010
<ApplicationIcon>QuickViewFile.ico</ApplicationIcon>
1111
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
1212
</PropertyGroup>

‎QuickViewFile/ViewModel/FilesListViewModel.cs‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,11 @@ private void RefreshFiles(string? fileToSelect = null)
108108
return;
109109
}
110110

111+
111112
Application.Current.Dispatcher.BeginInvoke(() =>
112113
{
113114
ActiveListItems.Clear();
114115

115-
bool userGivesPathToFile = false;
116-
if (fileToSelect is not null)
117-
{
118-
userGivesPathToFile = true;
119-
}
120-
121116
if (dirInfo.Parent != null)
122117
{
123118
ActiveListItems.Add(new ItemList
@@ -152,16 +147,20 @@ private void RefreshFiles(string? fileToSelect = null)
152147
IsDirectory = false,
153148
FileContentModel = new FileContentModel()
154149
});
150+
}
151+
152+
try
153+
{
154+
var selectThisFile = ActiveListItems.LastOrDefault(x => x.FullPath.Equals(fileToSelect, StringComparison.OrdinalIgnoreCase));
155+
if (selectThisFile is not null)
156+
SelectedItem = selectThisFile;
157+
else
158+
SelectedItem = ActiveListItems.First();
159+
}
160+
catch
161+
{
155162

156-
if (userGivesPathToFile)
157-
{
158-
if (file.FullName.Equals(fileToSelect))
159-
{
160-
SelectedItem = ActiveListItems.LastOrDefault();
161-
}
162-
}
163163
}
164-
SelectedItem = ActiveListItems.ElementAt(0);
165164
});
166165
}
167166

@@ -183,7 +182,7 @@ public async Task OnFileDoubleClick(ItemList? file)
183182

184183
_folderPath = file.FullPath!;
185184
RefreshFiles();
186-
SelectedItem = null;
185+
//SelectedItem = null;
187186
}
188187
else if (!file.IsDirectory && File.Exists(file.FullPath))
189188
{

0 commit comments

Comments
 (0)