CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-01 04:30:49 +12:00
Code Issues Packages Projects Releases Wiki Activity

Greenshot image editor merge

Browse source
This commit is contained in:
Jaex 2014-11-21 15:34:50 +02:00
parent fe803c4ad8
commit 995abf0057
7 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
GreenshotImageEditor/Drawing/Surface.cs
View file

@ -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);
}
}
/// <summary>
/// Draw a checkboard when capturing with transparency
/// </summary>
/// <param name="e">PaintEventArgs</param>
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);
}
}
/// <summary>

5
GreenshotImageEditor/Drawing/TextContainer.cs
View file

@ -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)
{

1
GreenshotImageEditor/Forms/DropShadowSettingsForm.cs
View file

@ -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)

10
InnoSetup/ShareX setup.iss
View file

@ -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

2
ShareX/Program.cs
View file

@ -39,7 +39,7 @@ namespace ShareX
{
internal static class Program
{
public static bool IsBeta = false;
public static bool IsBeta = true;
public static string Title
{

4
ShareX/Properties/AssemblyInfo.cs
View file

@ -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")]
[assembly: AssemblyVersion("9.4.2")]
[assembly: AssemblyFileVersion("9.4.2")]

14
ShareX_Setup/Program.cs
View file

@ -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.");
}