Skip to content

Commit 32fcdda

Browse files
committed
NullToCollapsedConverter
Fix logic click to change poto
1 parent d4a197e commit 32fcdda

File tree

3 files changed

+39
-12
lines changed

3 files changed

+39
-12
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Globalization;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
using System.Windows;
8+
using System.Windows.Data;
9+
10+
namespace QuickViewFile.Helpers
11+
{
12+
public class NullToCollapsedConverter : IValueConverter
13+
{
14+
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
15+
{
16+
var isNull = value is null;
17+
return isNull ? Visibility.Collapsed : Visibility.Visible;
18+
}
19+
20+
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
21+
{
22+
throw new NotImplementedException();
23+
}
24+
}
25+
}

QuickViewFile/MainWindow.xaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
mc:Ignorable="d"
1212
WindowState="Maximized"
1313
KeyDown="AppWindow_KeyDown"
14+
WindowStyle="ThreeDBorderWindow"
1415
MouseLeftButtonDown="Window_MouseLeftButtonDown"
1516
WindowStartupLocation="CenterOwner"
1617
FocusManager.FocusedElement="{Binding ElementName=FilesListView}"
1718
Title="QuickViewFile" Height="600" Width="1200">
1819
<Window.Resources>
1920
<BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
2021
<helpers:NullToVisibilityConverter x:Key="NullToVisibilityConverter"/>
22+
<helpers:NullToCollapsedConverter x:Key="NullToCollapsedConverter"/>
2123
<helpers:ScrollBarsVisibilityConverter x:Key="ScrollBarsVisibilityConverter"/>
2224
<Style TargetType="ListViewItem">
2325
<Setter Property="MinHeight" Value="40"/>
@@ -98,12 +100,12 @@
98100
Focusable="False"
99101
x:Name="VideoMedia"
100102
Content="{Binding SelectedItem.FileContentModel.VideoMedia}"
101-
Visibility="{Binding SelectedItem.FileContentModel.VideoMedia, Converter={StaticResource NullToVisibilityConverter}}"
103+
Visibility="{Binding SelectedItem.FileContentModel.VideoMedia, Converter={StaticResource NullToCollapsedConverter}}"
102104
/>
103105

104106

105107
<Grid Focusable="False"
106-
Visibility="{Binding SelectedItem.FileContentModel.ImageSource, Converter={StaticResource NullToVisibilityConverter}}"
108+
Visibility="{Binding SelectedItem.FileContentModel.ImageSource, Converter={StaticResource NullToCollapsedConverter}}"
107109
ClipToBounds="True">
108110
<local:ZoomableImage
109111
Source="{Binding SelectedItem.FileContentModel.ImageSource}"
@@ -114,23 +116,23 @@
114116
Width="Auto"
115117
HorizontalAlignment="Center"
116118
RenderOptions.BitmapScalingMode="{Binding Config.BitmapScalingMode}"
117-
Visibility="{Binding SelectedItem.FileContentModel.ImageSource, Converter={StaticResource NullToVisibilityConverter}}"
119+
Visibility="{Binding SelectedItem.FileContentModel.ImageSource, Converter={StaticResource NullToCollapsedConverter}}"
118120
ClipToBounds="True"/>
119121
</Grid>
120122

121123
<Grid ClipToBounds="True"
122-
Visibility="{Binding SelectedItem.FileContentModel.TextContent, Converter={StaticResource NullToVisibilityConverter}}"/>
124+
Visibility="{Binding SelectedItem.FileContentModel.TextContent, Converter={StaticResource NullToCollapsedConverter}}"/>
123125
<TextBox FontFamily="Consolas"
124126
SpellCheck.IsEnabled="False"
125127
IsReadOnly="False"
126128
KeyDown="AppWindow_KeyDown"
127129
Name="TextBoxTextContent"
128130
HorizontalScrollBarVisibility="Auto"
129-
VerticalScrollBarVisibility="Visible"
130-
Focusable="False"
131+
VerticalScrollBarVisibility="Auto"
132+
Focusable="True"
131133
Margin="10"
132134
ClipToBounds="True"
133-
Visibility="{Binding SelectedItem.FileContentModel.TextContent, Converter={StaticResource NullToVisibilityConverter}}"
135+
Visibility="{Binding SelectedItem.FileContentModel.TextContent, Converter={StaticResource NullToCollapsedConverter}}"
134136
FontSize="{Binding Config.FontSize}"
135137
Text="{Binding SelectedItem.FileContentModel.TextContent, Mode=OneWay}"
136138
TextWrapping="{Binding Config.TextPreviewWordWrap}"/>

QuickViewFile/MainWindow.xaml.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,19 +190,19 @@ private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
190190
{
191191
Point mousePosition = e.GetPosition(ContentGrid);
192192

193-
double previousPhoto = ContentGrid.ActualWidth * 0.008;
193+
double previousPhoto = ContentGrid.ActualWidth * 0.08;
194194
double nextPhoto = ContentGrid.ActualWidth * 0.92;
195195

196196
int nextFileIndex = FilesListView.SelectedIndex + 1;
197197
int previousFileIndex = FilesListView.SelectedIndex - 1;
198198

199-
if ((mousePosition.X < previousPhoto) && vm.ActiveListItems.ElementAt(nextFileIndex).IsDirectory == false)
199+
if ((mousePosition.X < previousPhoto) && vm.ActiveListItems.ElementAt(previousFileIndex).IsDirectory == false)
200200
{
201-
FilesListView.SelectedIndex++;
201+
FilesListView.SelectedIndex--;
202202
}
203-
else if ((mousePosition.X > nextPhoto) && vm.ActiveListItems.ElementAt(previousFileIndex).IsDirectory == false)
203+
else if ((mousePosition.X > nextPhoto) && vm.ActiveListItems.ElementAt(nextFileIndex).IsDirectory == false)
204204
{
205-
FilesListView.SelectedIndex--;
205+
FilesListView.SelectedIndex++;
206206
}
207207
}
208208
}

0 commit comments

Comments
 (0)