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

Increase version for beta

Browse source
This commit is contained in:
Jaex 2018-04-04 23:05:53 +03:00
parent 7c47e96ca1
commit 57cb894ce2
4 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ShareX.ScreenCaptureLib/RegionHelpers/ImageEditorScrollBar.cs
View file

@ -34,14 +34,13 @@ namespace ShareX.ScreenCaptureLib
internal class ImageEditorScrollbar : DrawableObject internal class ImageEditorScrollbar : DrawableObject
{ {
public Orientation Orientation { get; set; } public Orientation Orientation { get; set; }
public int Thickness { get; set; } = 15; //10; public int Thickness { get; set; } = 15;
public int Margin { get; set; } = 5; //15; public int Margin { get; set; } = 5;
public int Padding { get; set; } = 1; //2; public int Padding { get; set; } = 1;
public bool IsCapsule { get; set; } = true; //true; public bool IsCapsule { get; set; } = true;
public Color TrackColor { get; set; } = Color.FromArgb(49, 54, 66); //60, 60, 60); public Color TrackColor { get; set; } = Color.FromArgb(49, 54, 66);
public Color ThumbColor { get; set; } = Color.FromArgb(90, 94, 104); //130, 130, 130); public Color ThumbColor { get; set; } = Color.FromArgb(90, 94, 104);
public Color ActiveThumbColor { get; set; } = Color.FromArgb(111, 115, 123); public Color ActiveThumbColor { get; set; } = Color.FromArgb(111, 115, 123);
public float Opacity { get; private set; }
public Rectangle ThumbRectangle { get; private set; } public Rectangle ThumbRectangle { get; private set; }
private RegionCaptureForm form; private RegionCaptureForm form;
@ -92,7 +91,7 @@ public void Update()
int thumbLength = Math.Max(Thickness, (int)Math.Round((float)inImageVisibleSize / inImageSize * trackLengthInternal)); int thumbLength = Math.Max(Thickness, (int)Math.Round((float)inImageVisibleSize / inImageSize * trackLengthInternal));
double thumbLimit = (trackLengthInternal - thumbLength) / 2.0f; double thumbLimit = (trackLengthInternal - thumbLength) / 2.0f;
int thumbPosition = (int)Math.Round(Margin + trackLength / 2.0f - (thumbLength / 2.0f) - int thumbPosition = (int)Math.Round(Margin + trackLength / 2.0f - (thumbLength / 2.0f) -
Math.Min(thumbLimit, Math.Max(-thumbLimit, inCanvasCenterOffset / inImageSize * trackLengthInternal))); Math.Min(thumbLimit, Math.Max(-thumbLimit, inCanvasCenterOffset / inImageSize * trackLengthInternal)));
int trackWidth = Padding * 2 + Thickness; int trackWidth = Padding * 2 + Thickness;
int thumbSideOffset = sideOffsetBase - Margin - Padding - Thickness; int thumbSideOffset = sideOffsetBase - Margin - Padding - Thickness;
@ -186,9 +185,14 @@ private void Scroll(Point position)
int centerOffsetNew = (int)((trackLengthInternal / 2.0f - mousePositionLocal) / trackLengthInternal * inImageSize); int centerOffsetNew = (int)((trackLengthInternal / 2.0f - mousePositionLocal) / trackLengthInternal * inImageSize);
form.CanvasCenterOffset = Orientation == Orientation.Horizontal if (Orientation == Orientation.Horizontal)
? new Vector2(centerOffsetNew, form.CanvasCenterOffset.Y) {
: new Vector2(form.CanvasCenterOffset.X, centerOffsetNew); form.CanvasCenterOffset = new Vector2(centerOffsetNew, form.CanvasCenterOffset.Y);
}
else
{
form.CanvasCenterOffset = new Vector2(form.CanvasCenterOffset.X, centerOffsetNew);
}
form.AutomaticPan(); form.AutomaticPan();
} }

3
ShareX.ScreenCaptureLib/RegionHelpers/ScrollbarManager.cs
View file

@ -23,14 +23,13 @@
#endregion License Information (GPL v3) #endregion License Information (GPL v3)
using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
namespace ShareX.ScreenCaptureLib namespace ShareX.ScreenCaptureLib
{ {
internal class ScrollbarManager internal class ScrollbarManager
{ {
public bool IsVisible => horizontalScrollbar.Visible || verticalScrollbar.Visible; public bool Visible => horizontalScrollbar.Visible || verticalScrollbar.Visible;
private RegionCaptureForm form; private RegionCaptureForm form;
private ImageEditorScrollbar horizontalScrollbar, verticalScrollbar; private ImageEditorScrollbar horizontalScrollbar, verticalScrollbar;

2
ShareX/Program.cs
View file

@ -72,7 +72,7 @@ public static string Title
public static string TitleLong => $"{Title} ({Build})"; public static string TitleLong => $"{Title} ({Build})";
public static bool Beta { get; } = false; public static bool Beta { get; } = true;
public static bool MultiInstance { get; private set; } public static bool MultiInstance { get; private set; }
public static bool Portable { get; private set; } public static bool Portable { get; private set; }
public static bool PortableApps { get; private set; } public static bool PortableApps { get; private set; }

4
SharedAssemblyInfo.cs
View file

@ -5,5 +5,5 @@
[assembly: AssemblyProduct("ShareX")] [assembly: AssemblyProduct("ShareX")]
[assembly: AssemblyCopyright("Copyright (c) 2007-2018 ShareX Team")] [assembly: AssemblyCopyright("Copyright (c) 2007-2018 ShareX Team")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("12.1.1")] [assembly: AssemblyVersion("12.2.0")]
[assembly: AssemblyFileVersion("12.1.1")] [assembly: AssemblyFileVersion("12.2.0")]