From d937aa8f30dcb44f37ecfd5a7b5e88d4ccaced43 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 1 May 2026 17:35:25 +0000
Subject: [PATCH 1/2] Initial plan


From 06472b700a7cbdc8195d9a8662f8b6db3136375a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 1 May 2026 17:40:03 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=BB=E5=83=8F=E8=AA=AD=E3=81=BF?=
 =?UTF-8?q?=E8=BE=BC=E3=81=BF=E6=99=82=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E3=83=8F=E3=83=B3=E3=83=89=E3=83=AB=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Agent-Logs-Url: https://github.com/Freeesia/VdLabel/sessions/769b5045-24de-42dc-a378-28274fad0e77

Co-authored-by: Freeesia <9002657+Freeesia@users.noreply.github.com>
---
 VdLabel/DesktopCatalog.xaml   |  5 ++++-
 VdLabel/MainWindow.xaml       |  5 +++--
 VdLabel/OverlayWindow.xaml    |  3 ++-
 VdLabel/OverlayWindow.xaml.cs | 36 +++++++++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/VdLabel/DesktopCatalog.xaml b/VdLabel/DesktopCatalog.xaml
index 2639214..63feb99 100644
--- a/VdLabel/DesktopCatalog.xaml
+++ b/VdLabel/DesktopCatalog.xaml
@@ -25,6 +25,9 @@
     WindowBackdropType="Mica"
     WindowCornerPreference="Default"
     mc:Ignorable="d">
+    <ui:FluentWindow.Resources>
+        <local:FilePathToImageSourceConverter x:Key="filePathToImageConv" />
+    </ui:FluentWindow.Resources>
     <ui:FluentWindow.InputBindings>
         <KeyBinding Key="Esc" Command="ApplicationCommands.Close" />
         <KeyBinding Key="Enter" Command="ApplicationCommands.Close" />
@@ -58,7 +61,7 @@
                             <ui:Image
                                 CornerRadius="8"
                                 Focusable="False"
-                                Source="{Binding ImagePath}" />
+                                Source="{Binding ImagePath, Converter={StaticResource filePathToImageConv}}" />
                             <ItemsControl
                                 Margin="6"
                                 HorizontalAlignment="Left"
diff --git a/VdLabel/MainWindow.xaml b/VdLabel/MainWindow.xaml
index e84f0d1..f1ce001 100644
--- a/VdLabel/MainWindow.xaml
+++ b/VdLabel/MainWindow.xaml
@@ -35,6 +35,7 @@
             <Setter Property="MinWidth" Value="80" />
         </Style>
         <BooleanToVisibilityConverter x:Key="b2vConv" />
+        <local:FilePathToImageSourceConverter x:Key="filePathToImageConv" />
     </ui:FluentWindow.Resources>
     <Grid>
         <DockPanel>
@@ -263,7 +264,7 @@
                                             <Image
                                                 Height="16"
                                                 DockPanel.Dock="Left"
-                                                Source="{Binding ImagePath}" />
+                                                Source="{Binding ImagePath, Converter={StaticResource filePathToImageConv}}" />
                                             <emoji:TextBlock
                                                 Margin="4,0"
                                                 Text="{Binding Title}"
@@ -399,7 +400,7 @@
                                     Grid.ColumnSpan="2"
                                     Height="120"
                                     CornerRadius="4"
-                                    Source="{Binding ImagePath}"
+                                    Source="{Binding ImagePath, Converter={StaticResource filePathToImageConv}}"
                                     Visibility="{Binding IsVisibleImage, Converter={StaticResource b2vConv}}" />
                                 <Label
                                     Grid.Row="8"
diff --git a/VdLabel/OverlayWindow.xaml b/VdLabel/OverlayWindow.xaml
index 4cef043..1a4abf0 100644
--- a/VdLabel/OverlayWindow.xaml
+++ b/VdLabel/OverlayWindow.xaml
@@ -22,6 +22,7 @@
     mc:Ignorable="d">
     <Window.Resources>
         <BooleanToVisibilityConverter x:Key="b2vConv" />
+        <local:FilePathToImageSourceConverter x:Key="filePathToImageConv" />
     </Window.Resources>
     <Grid
         Width="{Binding OverlaySize, Mode=OneWay}"
@@ -73,7 +74,7 @@
                 <Grid>
                     <ui:Image
                         CornerRadius="8"
-                        Source="{Binding ImagePath}"
+                        Source="{Binding ImagePath, Converter={StaticResource filePathToImageConv}}"
                         Visibility="{Binding IsVisibleImage, Converter={StaticResource b2vConv}}" />
                     <ItemsControl
                         Margin="12"
diff --git a/VdLabel/OverlayWindow.xaml.cs b/VdLabel/OverlayWindow.xaml.cs
index ab30c84..6dc803d 100644
--- a/VdLabel/OverlayWindow.xaml.cs
+++ b/VdLabel/OverlayWindow.xaml.cs
@@ -53,6 +53,42 @@ private void TopMost()
     }
 }
 
+/// <summary>
+/// ファイルパス文字列を ImageSource に変換するコンバーター。
+/// BitmapCacheOption.OnLoad を使用することで、読み込み後にファイルハンドルを解放する。
+/// </summary>
+[ValueConversion(typeof(string), typeof(System.Windows.Media.Imaging.BitmapImage))]
+public sealed class FilePathToImageSourceConverter : IValueConverter
+{
+    public static FilePathToImageSourceConverter Default { get; } = new FilePathToImageSourceConverter();
+
+    public object? Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+    {
+        if (value is not string path || string.IsNullOrEmpty(path) || !System.IO.File.Exists(path))
+        {
+            return null;
+        }
+
+        try
+        {
+            var bitmap = new System.Windows.Media.Imaging.BitmapImage();
+            bitmap.BeginInit();
+            bitmap.UriSource = new Uri(path, UriKind.Absolute);
+            bitmap.CacheOption = System.Windows.Media.Imaging.BitmapCacheOption.OnLoad;
+            bitmap.EndInit();
+            bitmap.Freeze();
+            return bitmap;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        => throw new NotSupportedException();
+}
+
 [ValueConversion(typeof(System.Drawing.Color), typeof(SolidColorBrush))]
 public sealed class SystemColorToSolidBrushConverter : IValueConverter
 {