Skip to content

Commit e7819d4

Browse files
committed
Fix video was playing in background when user changed window to NoBerder (F4)
Saving font size to registry when user changes it, to save that when app will close Fix changing photo when window is set to noborder wasn't possible without zooming it Version upgrade
1 parent 54e1ccd commit e7819d4

File tree

6 files changed

+36
-3
lines changed

6 files changed

+36
-3
lines changed

QuickViewFile/Controls/VideoPlayerControl.xaml.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,13 @@ private void Stop_Executed(object sender, ExecutedRoutedEventArgs e)
129129
mediaPlayerIsPlaying = false;
130130
}
131131

132+
public void StopForce()
133+
{
134+
videoInWindowPlayer.Stop();
135+
isVideoPaused = true;
136+
mediaPlayerIsPlaying = false;
137+
}
138+
132139
private void sliProgress_DragStarted(object sender, DragStartedEventArgs e)
133140
{
134141
userIsDraggingSlider = true;

QuickViewFile/Helpers/ConfigHelper.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,16 @@ public static double GetVolume()
126126
{
127127
return loadedConfig.Volume;
128128
}
129+
public static void SetFontSize(double fontSize)
130+
{
131+
loadedConfig.FontSize = fontSize;
132+
SaveConfig(loadedConfig);
133+
}
134+
135+
public static double GetFontSize()
136+
{
137+
return loadedConfig.FontSize;
138+
}
129139

130140
public static ConfigParsedModel LoadParsedConfig()
131141
{

QuickViewFile/MainWindow.xaml.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,16 @@ private void AppWindow_KeyDown(object sender, KeyEventArgs e)
238238
TextBoxTextContent.FontSize -= 0.5;
239239
}
240240
}
241+
ConfigHelper.SetFontSize(TextBoxTextContent.FontSize);
241242
}
242243

243244
if (e.Key == Key.F4 && vm.SelectedItem?.FullPath is not null)
244245
{
245246
MainWindowNoBorder fullScreen = new MainWindowNoBorder(vm.SelectedItem.FullPath);
247+
if (vm.SelectedItem.FileContentModel.VideoMedia is not null)
248+
{
249+
vm.SelectedItem.FileContentModel.VideoMedia.StopForce();
250+
}
246251
fullScreen.Show();
247252
this.Close();
248253
}

QuickViewFile/MainWindowNoBorder.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
Name="GridFileContent" ClipToBounds="True" Grid.IsSharedSizeScope="True" IsManipulationEnabled="True" SnapsToDevicePixels="True">
139139

140140
<local:VideoPlayerControl
141-
x:Name="VideoMedia"
141+
x:Name="VideoMediaNoBorder"
142142
Content="{Binding SelectedItem.FileContentModel.VideoMedia}"
143143
Visibility="{Binding SelectedItem.FileContentModel.VideoMedia, Converter={StaticResource NullToCollapsedConverter}}" />
144144

@@ -152,7 +152,7 @@
152152
Source="{Binding SelectedItem.FileContentModel.ImageSource}"
153153
VerticalAlignment="Center"
154154
Stretch="Uniform"
155-
x:Name="ZoomableImageElement"
155+
x:Name="ZoomableImageElementNoBorder"
156156
HorizontalAlignment="Center"
157157
RenderOptions.BitmapScalingMode="{Binding Config.BitmapScalingMode}"
158158
Visibility="{Binding SelectedItem.FileContentModel.ImageSource, Converter={StaticResource NullToCollapsedConverter}}"

QuickViewFile/MainWindowNoBorder.xaml.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,16 @@ private void AppWindow_KeyDown(object sender, KeyEventArgs e)
174174
TextBoxTextContent.FontSize -= 0.5;
175175
}
176176
}
177+
ConfigHelper.SetFontSize(TextBoxTextContent.FontSize);
177178
}
178179

179180
if (e.Key == Key.F4 && vm.SelectedItem?.FullPath is not null)
180181
{
181182
MainWindow normalWindow = new MainWindow(vm.SelectedItem.FullPath);
183+
if (vm.SelectedItem.FileContentModel.VideoMedia is not null)
184+
{
185+
vm.SelectedItem.FileContentModel.VideoMedia.StopForce();
186+
}
182187
normalWindow.Show();
183188
this.Close();
184189
}
@@ -286,6 +291,12 @@ private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
286291
double previousItem = GridFileContent.ActualWidth * 0.08;
287292
double nextItem = GridFileContent.ActualWidth * 0.92;
288293

294+
if (vm.SelectedItem.FileContentModel.ImageSource is not null)
295+
{
296+
previousItem = ZoomableImageElementNoBorder.ActualWidth * 0.08;
297+
nextItem = ZoomableImageElementNoBorder.ActualWidth * 0.92;
298+
}
299+
289300
int nextFileIndex = FilesListView.SelectedIndex + 1;
290301
int previousFileIndex = FilesListView.SelectedIndex - 1;
291302

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.7.2.5</Version>
9+
<Version>1.7.2.6</Version>
1010
<ApplicationIcon>QuickViewFile.ico</ApplicationIcon>
1111
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
1212
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>

0 commit comments

Comments
 (0)