From f495e77b68b46995edfc367aa74b6ea0d7160292 Mon Sep 17 00:00:00 2001
From: Etienne BAUDOUX <ebaudoux@velersoftware.com>
Date: Tue, 5 Sep 2017 21:17:51 -0700
Subject: [PATCH] Fixed a binding and an issue linked to the transparency of
 copied pictures.

---
 Android/app/build.gradle                                      | 2 +-
 .../ComponentModel/DataHelper.cs                              | 2 +-
 .../Sources/ClipboardZanager/Properties/AssemblyInfo.cs       | 4 ++--
 .../Sources/ClipboardZanager/Views/PasteBarWindow.xaml        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Android/app/build.gradle b/Android/app/build.gradle
index 5cacb06..ea8d748 100644
--- a/Android/app/build.gradle
+++ b/Android/app/build.gradle
@@ -34,7 +34,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 25
         versionCode 1
-        versionName "2017.9.3.56" // Do NOT change this line manually. It is changed automatically everytime the Windows app is built.
+        versionName "2017.9.6.5" // Do NOT change this line manually. It is changed automatically everytime the Windows app is built.
         // Do NOT change this line manually. It is changed automatically everytime the Windows app is built.
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         jackOptions {
diff --git a/ClipboardZanager/Sources/ClipboardZanager.Core.Desktop/ComponentModel/DataHelper.cs b/ClipboardZanager/Sources/ClipboardZanager.Core.Desktop/ComponentModel/DataHelper.cs
index 1d621e7..2b0b776 100644
--- a/ClipboardZanager/Sources/ClipboardZanager.Core.Desktop/ComponentModel/DataHelper.cs
+++ b/ClipboardZanager/Sources/ClipboardZanager.Core.Desktop/ComponentModel/DataHelper.cs
@@ -219,7 +219,7 @@ internal static BitmapSource DeviceIndependentBitmapToBitmapSource(MemoryStream
                 try
                 {
                     var ptr = new IntPtr((long)gch.AddrOfPinnedObject() + 40);
-                    bmp = new Bitmap(width, height, width * 4, PixelFormat.Format32bppArgb, ptr);
+                    bmp = new Bitmap(width, height, width * 4, PixelFormat.Format32bppRgb, ptr);
                     bmp.MakeTransparent(Color.Transparent);
                     bmp.RotateFlip(RotateFlipType.Rotate180FlipX);
 
diff --git a/ClipboardZanager/Sources/ClipboardZanager/Properties/AssemblyInfo.cs b/ClipboardZanager/Sources/ClipboardZanager/Properties/AssemblyInfo.cs
index 67881a6..4e19b4e 100644
--- a/ClipboardZanager/Sources/ClipboardZanager/Properties/AssemblyInfo.cs
+++ b/ClipboardZanager/Sources/ClipboardZanager/Properties/AssemblyInfo.cs
@@ -55,8 +55,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2017.9.3.56")]
-[assembly: AssemblyFileVersion("2017.9.3.56")]
+[assembly: AssemblyVersion("2017.9.6.5")]
+[assembly: AssemblyFileVersion("2017.9.6.5")]
 
 [assembly: InternalsVisibleTo("ClipboardZanager.Tests")]
 
diff --git a/ClipboardZanager/Sources/ClipboardZanager/Views/PasteBarWindow.xaml b/ClipboardZanager/Sources/ClipboardZanager/Views/PasteBarWindow.xaml
index 32a7532..1e020d2 100644
--- a/ClipboardZanager/Sources/ClipboardZanager/Views/PasteBarWindow.xaml
+++ b/ClipboardZanager/Sources/ClipboardZanager/Views/PasteBarWindow.xaml
@@ -219,7 +219,7 @@
                                                         </i:EventTrigger>
                                                     </i:Interaction.Triggers>
                                                 </Button>
-                                                <TextBlock Text="{Binding Date, Converter={StaticResource DateTimeToTimeSpanStringConverter}}" Margin="10,0,0,0" FontSize="20" Foreground="{StaticResource PasteBarItemMoreInfoForeground}" VerticalAlignment="Center" Focusable="{Binding IsScreenReaderRunning}"/>
+                                                <TextBlock Text="{Binding Date, Converter={StaticResource DateTimeToTimeSpanStringConverter}}" Margin="10,0,0,0" FontSize="20" Foreground="{StaticResource PasteBarItemMoreInfoForeground}" VerticalAlignment="Center" Focusable="{Binding DataContext.IsScreenReaderRunning, ElementName=blurredWindow}"/>
                                             </StackPanel>
                                         </ScrollViewer>
                                     </DockPanel>