diff --git a/ShareX.ScreenCaptureLib/RegionHelpers/ImageEditorScrollBar.cs b/ShareX.ScreenCaptureLib/RegionHelpers/ImageEditorScrollBar.cs index 1ed5e5db4..0dabc0fd8 100644 --- a/ShareX.ScreenCaptureLib/RegionHelpers/ImageEditorScrollBar.cs +++ b/ShareX.ScreenCaptureLib/RegionHelpers/ImageEditorScrollBar.cs @@ -34,14 +34,13 @@ namespace ShareX.ScreenCaptureLib internal class ImageEditorScrollbar : DrawableObject { public Orientation Orientation { get; set; } - public int Thickness { get; set; } = 15; //10; - public int Margin { get; set; } = 5; //15; - public int Padding { get; set; } = 1; //2; - public bool IsCapsule { get; set; } = true; //true; - public Color TrackColor { get; set; } = Color.FromArgb(49, 54, 66); //60, 60, 60); - public Color ThumbColor { get; set; } = Color.FromArgb(90, 94, 104); //130, 130, 130); + public int Thickness { get; set; } = 15; + public int Margin { get; set; } = 5; + public int Padding { get; set; } = 1; + public bool IsCapsule { get; set; } = true; + public Color TrackColor { get; set; } = Color.FromArgb(49, 54, 66); + public Color ThumbColor { get; set; } = Color.FromArgb(90, 94, 104); public Color ActiveThumbColor { get; set; } = Color.FromArgb(111, 115, 123); - public float Opacity { get; private set; } public Rectangle ThumbRectangle { get; private set; } private RegionCaptureForm form; @@ -92,7 +91,7 @@ public void Update() int thumbLength = Math.Max(Thickness, (int)Math.Round((float)inImageVisibleSize / inImageSize * trackLengthInternal)); double thumbLimit = (trackLengthInternal - 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 thumbSideOffset = sideOffsetBase - Margin - Padding - Thickness; @@ -186,9 +185,14 @@ private void Scroll(Point position) int centerOffsetNew = (int)((trackLengthInternal / 2.0f - mousePositionLocal) / trackLengthInternal * inImageSize); - form.CanvasCenterOffset = Orientation == Orientation.Horizontal - ? new Vector2(centerOffsetNew, form.CanvasCenterOffset.Y) - : new Vector2(form.CanvasCenterOffset.X, centerOffsetNew); + if (Orientation == Orientation.Horizontal) + { + form.CanvasCenterOffset = new Vector2(centerOffsetNew, form.CanvasCenterOffset.Y); + } + else + { + form.CanvasCenterOffset = new Vector2(form.CanvasCenterOffset.X, centerOffsetNew); + } form.AutomaticPan(); } diff --git a/ShareX.ScreenCaptureLib/RegionHelpers/ScrollbarManager.cs b/ShareX.ScreenCaptureLib/RegionHelpers/ScrollbarManager.cs index 5517972d7..f06a9bc18 100644 --- a/ShareX.ScreenCaptureLib/RegionHelpers/ScrollbarManager.cs +++ b/ShareX.ScreenCaptureLib/RegionHelpers/ScrollbarManager.cs @@ -23,14 +23,13 @@ You should have received a copy of the GNU General Public License #endregion License Information (GPL v3) -using System.Drawing; using System.Windows.Forms; namespace ShareX.ScreenCaptureLib { internal class ScrollbarManager { - public bool IsVisible => horizontalScrollbar.Visible || verticalScrollbar.Visible; + public bool Visible => horizontalScrollbar.Visible || verticalScrollbar.Visible; private RegionCaptureForm form; private ImageEditorScrollbar horizontalScrollbar, verticalScrollbar; diff --git a/ShareX/Program.cs b/ShareX/Program.cs index 309d2c37d..0204e3c79 100644 --- a/ShareX/Program.cs +++ b/ShareX/Program.cs @@ -72,7 +72,7 @@ public static string Title 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 Portable { get; private set; } public static bool PortableApps { get; private set; } diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index 147a7e26f..265648144 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -5,5 +5,5 @@ [assembly: AssemblyProduct("ShareX")] [assembly: AssemblyCopyright("Copyright (c) 2007-2018 ShareX Team")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("12.1.1")] -[assembly: AssemblyFileVersion("12.1.1")] \ No newline at end of file +[assembly: AssemblyVersion("12.2.0")] +[assembly: AssemblyFileVersion("12.2.0")] \ No newline at end of file