Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #21 - Issue linked to the transparency of copied pictures #29

Merged
merged 1 commit into from
Sep 6, 2017
+5 −5
Merged

Fix #21 - Issue linked to the transparency of copied pictures #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ClipboardZanager/Sources/ClipboardZanager.Core.Desktop/ComponentModel/DataHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions ClipboardZanager/Sources/ClipboardZanager/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]

2 changes: 1 addition & 1 deletion ClipboardZanager/Sources/ClipboardZanager/Views/PasteBarWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down