diff --git a/GreenshotImageEditor/Drawing/Surface.cs b/GreenshotImageEditor/Drawing/Surface.cs
index 2c09c2dc7..1e2c8ad3c 100644
--- a/GreenshotImageEditor/Drawing/Surface.cs
+++ b/GreenshotImageEditor/Drawing/Surface.cs
@@ -1412,6 +1412,7 @@ private void SurfacePaint(object sender, PaintEventArgs e)
//graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
//graphics.CompositingQuality = CompositingQuality.HighQuality;
//graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
+ DrawBackground(graphics, clipRectangle);
graphics.DrawImage(Image, clipRectangle, clipRectangle, GraphicsUnit.Pixel);
graphics.SetClip(targetGraphics);
_elements.Draw(graphics, _buffer, RenderMode.EDIT, clipRectangle);
@@ -1420,30 +1421,31 @@ private void SurfacePaint(object sender, PaintEventArgs e)
}
else
{
+ DrawBackground(targetGraphics, clipRectangle);
targetGraphics.DrawImage(Image, clipRectangle, clipRectangle, GraphicsUnit.Pixel);
_elements.Draw(targetGraphics, null, RenderMode.EDIT, clipRectangle);
}
}
+ private void DrawBackground(Graphics targetGraphics, Rectangle clipRectangle)
+ {
+ // check if we need to draw the checkerboard
+ if (Image.IsAlphaPixelFormat(Image.PixelFormat) && _transparencyBackgroundBrush != null)
+ {
+ targetGraphics.FillRectangle(_transparencyBackgroundBrush, clipRectangle);
+ }
+ else
+ {
+ targetGraphics.Clear(BackColor);
+ }
+ }
+
///
/// Draw a checkboard when capturing with transparency
///
/// PaintEventArgs
protected override void OnPaintBackground(PaintEventArgs e)
{
- // check if we need to draw the checkerboard
- if (Image.IsAlphaPixelFormat(Image.PixelFormat) && _transparencyBackgroundBrush != null)
- {
- Graphics targetGraphics = e.Graphics;
- Rectangle clipRectangle = e.ClipRectangle;
- targetGraphics.FillRectangle(_transparencyBackgroundBrush, clipRectangle);
- }
- else
- {
- Graphics targetGraphics = e.Graphics;
- targetGraphics.Clear(BackColor);
- //base.OnPaintBackground(e);
- }
}
///
diff --git a/GreenshotImageEditor/Drawing/TextContainer.cs b/GreenshotImageEditor/Drawing/TextContainer.cs
index 7e527503e..d7dbe4a9c 100644
--- a/GreenshotImageEditor/Drawing/TextContainer.cs
+++ b/GreenshotImageEditor/Drawing/TextContainer.cs
@@ -182,6 +182,11 @@ private void TextContainer_PropertyChanged(object sender, PropertyChangedEventAr
{
ShowTextBox();
}
+ else if (Selected && Status == EditStatus.IDLE && _textBox.Visible)
+ {
+ // Fix (workaround) for BUG-1698
+ _parent.KeysLocked = true;
+ }
}
if (_textBox.Visible)
{
diff --git a/GreenshotImageEditor/Forms/DropShadowSettingsForm.cs b/GreenshotImageEditor/Forms/DropShadowSettingsForm.cs
index f3c77dfd4..4f38a34b1 100644
--- a/GreenshotImageEditor/Forms/DropShadowSettingsForm.cs
+++ b/GreenshotImageEditor/Forms/DropShadowSettingsForm.cs
@@ -39,6 +39,7 @@ public DropShadowSettingsForm(DropShadowEffect effect)
trackBar1.Value = (int)(effect.Darkness * 40);
offsetX.Value = effect.ShadowOffset.X;
offsetY.Value = effect.ShadowOffset.Y;
+ thickness.Value = effect.ShadowSize;
}
private void buttonOK_Click(object sender, EventArgs e)
diff --git a/InnoSetup/ShareX setup.iss b/InnoSetup/ShareX setup.iss
index cc7e5affa..77b01a705 100644
--- a/InnoSetup/ShareX setup.iss
+++ b/InnoSetup/ShareX setup.iss
@@ -1,11 +1,6 @@
#define MyAppName "ShareX"
#define MyAppFile "ShareX.exe"
-#ifdef Debug
- #define MyAppBuildType "Debug"
-#else
- #define MyAppBuildType "Release"
-#endif
-#define MyAppParentDir "..\ShareX\bin\" + MyAppBuildType
+#define MyAppParentDir "..\ShareX\bin\Release"
#define MyAppPath MyAppParentDir + "\ShareX.exe"
#dim Version[4]
#expr ParseVersion(MyAppPath, Version[0], Version[1], Version[2], Version[3])
@@ -71,9 +66,6 @@ Source: "{#MyAppParentDir}\ShareX.exe.config"; DestDir: {app}; Flags: ignorevers
Source: "{#MyAppParentDir}\*.dll"; DestDir: {app}; Flags: ignoreversion
Source: "{#MyAppParentDir}\*.css"; DestDir: {app}; Flags: ignoreversion
Source: "{#MyAppParentDir}\*.txt"; DestDir: {app}; Flags: ignoreversion
-#ifdef Debug
- Source: "{#MyAppParentDir}\*.pdb"; DestDir: {app}; Flags: ignoreversion
-#endif
; Language resources
Source: "{#MyAppParentDir}\tr\*.resources.dll"; DestDir: {app}\Languages\tr; Flags: ignoreversion
diff --git a/ShareX/Program.cs b/ShareX/Program.cs
index 3f497f95f..26fef6535 100644
--- a/ShareX/Program.cs
+++ b/ShareX/Program.cs
@@ -39,7 +39,7 @@ namespace ShareX
{
internal static class Program
{
- public static bool IsBeta = false;
+ public static bool IsBeta = true;
public static string Title
{
diff --git a/ShareX/Properties/AssemblyInfo.cs b/ShareX/Properties/AssemblyInfo.cs
index 69492bb6e..3807c2468 100644
--- a/ShareX/Properties/AssemblyInfo.cs
+++ b/ShareX/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: Guid("82E6AC09-0FEF-4390-AD9F-0DD3F5561EFC")]
-[assembly: AssemblyVersion("9.4.1")]
-[assembly: AssemblyFileVersion("9.4.1")]
\ No newline at end of file
+[assembly: AssemblyVersion("9.4.2")]
+[assembly: AssemblyFileVersion("9.4.2")]
\ No newline at end of file
diff --git a/ShareX_Setup/Program.cs b/ShareX_Setup/Program.cs
index fd1801822..9f7102770 100644
--- a/ShareX_Setup/Program.cs
+++ b/ShareX_Setup/Program.cs
@@ -37,8 +37,8 @@ internal class Program
{
private enum SetupType
{
- Stable, // Release build setup, creates portable zip file
- Beta // Debug build setup, uploads it using Debug/ShareX.exe
+ Stable, // Build setup + create portable zip file
+ Beta // Build setup + upload it using "Debug/ShareX.exe"
}
private const SetupType Setup = SetupType.Beta;
@@ -59,12 +59,12 @@ private static void Main(string[] args)
switch (Setup)
{
case SetupType.Stable:
- CompileSetup("Release");
+ CompileSetup();
CreatePortable();
OpenOutputDirectory();
break;
case SetupType.Beta:
- CompileSetup("Debug");
+ CompileSetup();
UploadLatestFile();
break;
}
@@ -88,10 +88,10 @@ private static void UploadLatestFile()
}
}
- private static void CompileSetup(string buildType)
+ private static void CompileSetup()
{
- Console.WriteLine("Compiling " + buildType + " setup...");
- Process.Start(innoSetupPath, string.Format("\"{0}\" /d{1}", innoSetupScriptPath, buildType)).WaitForExit();
+ Console.WriteLine("Compiling setup...");
+ Process.Start(innoSetupPath, string.Format("\"{0}\"", innoSetupScriptPath)).WaitForExit();
Console.WriteLine("Setup file created.");
}