From 821935449be544e466b067cf3edf2176417e03f1 Mon Sep 17 00:00:00 2001 From: rampaa Date: Thu, 23 Jun 2022 23:24:29 +0300 Subject: [PATCH] Bump version number --- JL.Core/Storage.cs | 2 +- JL.Windows/GUI/MainWindow.xaml.cs | 37 +++++++++++-------------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/JL.Core/Storage.cs b/JL.Core/Storage.cs index bb14650a..0027b3c0 100644 --- a/JL.Core/Storage.cs +++ b/JL.Core/Storage.cs @@ -29,7 +29,7 @@ public static class Storage public static readonly string ResourcesPath = Path.Join(AppContext.BaseDirectory, "Resources"); public static readonly string ConfigPath = Path.Join(AppContext.BaseDirectory, "Config"); public static readonly HttpClient Client = new(new HttpClientHandler { UseProxy = false }) { Timeout = TimeSpan.FromMinutes(10) }; - public static readonly Version Version = new(1, 11, 1); + public static readonly Version Version = new(1, 12, 0); public static readonly string GitHubApiUrlForLatestJLRelease = "https://api.github.com/repos/rampaa/JL/releases/latest"; public static readonly Uri JmdictUrl = new("http://ftp.edrdg.org/pub/Nihongo/JMdict_e.gz"); public static readonly Uri JmnedictUrl = new("http://ftp.edrdg.org/pub/Nihongo/JMnedict.xml.gz"); diff --git a/JL.Windows/GUI/MainWindow.xaml.cs b/JL.Windows/GUI/MainWindow.xaml.cs index 69c7652d..41aa8f0c 100644 --- a/JL.Windows/GUI/MainWindow.xaml.cs +++ b/JL.Windows/GUI/MainWindow.xaml.cs @@ -749,6 +749,7 @@ private void Border_OnMouseLeave(object sender, MouseEventArgs e) // WindowResizer.SetWindowPos(_windowResizer.windowHandle, IntPtr.Zero, Convert.ToInt32(Left + e.HorizontalChange), Convert.ToInt32(Top + e.VerticalChange), Convert.ToInt32(Width), Convert.ToInt32(Height), //WindowResizer.SetWindowPosFlags.SWP_SHOWWINDOW | WindowResizer.SetWindowPosFlags.SWP_NOREDRAW); //} + private void ResizeWindow(object sender, MouseButtonEventArgs e) { _winApi?.ResizeWindow(sender as Border ?? new()); @@ -759,33 +760,21 @@ private void ResizeWindow(object sender, MouseButtonEventArgs e) WidthBeforeResolutionChange = Width; } - public bool IsMouseOnTitleBar(int lParam) - { - int x = lParam << 16 >> 16; - int y = lParam >> 16; - Point cursorPoint = PointFromScreen(new Point(x, y)); - - HitTestResult? hitTestResult = VisualTreeHelper.HitTest(this, cursorPoint); - - if (hitTestResult != null) - { - return hitTestResult.VisualHit == TitleBar; - } - - return false; - } + //public bool IsMouseOnTitleBar(int lParam) + //{ + // int x = lParam << 16 >> 16; + // int y = lParam >> 16; + // Point cursorPoint = PointFromScreen(new Point(x, y)); - public bool IsMouseOnTitleBar(Point cursorPoint) - { - HitTestResult? hitTestResult = VisualTreeHelper.HitTest(this, cursorPoint); + // HitTestResult? hitTestResult = VisualTreeHelper.HitTest(this, cursorPoint); - if (hitTestResult != null) - { - return hitTestResult.VisualHit == TitleBar; - } + // if (hitTestResult != null) + // { + // return hitTestResult.VisualHit == TitleBar; + // } - return false; - } + // return false; + //} private void TitleBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) {