From 857b06655f61ac586d9c0bf8bd6147211ddc0a3b Mon Sep 17 00:00:00 2001
From: iTob <tobias@wohlleben.dev>
Date: Wed, 25 Feb 2026 20:50:19 +0100
Subject: [PATCH] open picture fix

---
 .../Features/PictureGallery/PictureGalleryPage.xaml    | 10 +++++++++-
 .../Features/PictureGallery/PictureGalleryPage.xaml.cs |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/CamBooth/CamBooth.App/Features/PictureGallery/PictureGalleryPage.xaml b/src/CamBooth/CamBooth.App/Features/PictureGallery/PictureGalleryPage.xaml
index 1abde65..b1c8a90 100644
--- a/src/CamBooth/CamBooth.App/Features/PictureGallery/PictureGalleryPage.xaml
+++ b/src/CamBooth/CamBooth.App/Features/PictureGallery/PictureGalleryPage.xaml
@@ -9,7 +9,15 @@
       Background="Black">
    
     <Grid>
-        <WrapPanel VerticalAlignment="Stretch" Background="Black" x:Name="PicturesPanel" Orientation="Horizontal" />
+        <ScrollViewer x:Name="GalleryScrollViewer" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Background="Black" CanContentScroll="False">
+            <ItemsControl x:Name="PicturesPanel" Background="Black">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <WrapPanel Orientation="Horizontal" />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+            </ItemsControl>
+        </ScrollViewer>
         <ContentPresenter x:Name="RootContentDialogPresenter" Grid.Row="0" />
     </Grid>
 </Page>
\ No newline at end of file
diff --git a/src/CamBooth/CamBooth.App/Features/PictureGallery/PictureGalleryPage.xaml.cs b/src/CamBooth/CamBooth.App/Features/PictureGallery/PictureGalleryPage.xaml.cs
index 2fef41e..501d84b 100644
--- a/src/CamBooth/CamBooth.App/Features/PictureGallery/PictureGalleryPage.xaml.cs
+++ b/src/CamBooth/CamBooth.App/Features/PictureGallery/PictureGalleryPage.xaml.cs
@@ -1,4 +1,4 @@
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Media;
@@ -84,7 +84,7 @@ public partial class PictureGalleryPage : Page
 					hyperlink.Inlines.Add(new InlineUIContainer(imageControl));
 
 					textBlock.Inlines.Add(hyperlink);
-					this.PicturesPanel.Children.Add(textBlock);
+					this.PicturesPanel.Items.Add(textBlock);
 					loop++;
 				}
 				while ((loop < howManyPictures || howManyPictures == 0) && loop < this._pictureGalleryService.ThumbnailsOrderedByNewestDescending.Count);
@@ -125,7 +125,7 @@ public partial class PictureGalleryPage : Page
 			return;
 		}
 
-		string picturePath = picturePathUri.AbsolutePath;
+		string picturePath = Uri.UnescapeDataString(picturePathUri.AbsolutePath);
 		Application.Current.Dispatcher.BeginInvoke(
 			async () =>
 			{