From 1c5726245ae164a935565606d6f85ca45aadfed3 Mon Sep 17 00:00:00 2001 From: JanuarySnow Date: Wed, 17 Jul 2024 14:03:05 +0100 Subject: [PATCH] added sanity checks for dragmove for actual button being pressed --- Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs | 7 +++++-- Wabbajack.App.Wpf/Views/MainWindow.xaml.cs | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs b/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs index a77c5b78..76f78e14 100644 --- a/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs +++ b/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs @@ -9,6 +9,7 @@ using System.Windows.Controls; using System.Windows.Input; using MahApps.Metro.Controls; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Microsoft.Web.WebView2.Wpf; using ReactiveUI; using Wabbajack.Common; @@ -25,7 +26,6 @@ public partial class BrowserWindow : MetroWindow { InitializeComponent(); - _disposable = new CompositeDisposable(); _serviceProvider = serviceProvider; Browser = _serviceProvider.GetRequiredService(); @@ -43,7 +43,10 @@ public partial class BrowserWindow : MetroWindow private void UIElement_OnMouseDown(object sender, MouseButtonEventArgs e) { - base.DragMove(); + if (e.LeftButton == MouseButtonState.Pressed) + { + base.DragMove(); + } } private void BrowserWindow_OnActivated(object sender, EventArgs e) diff --git a/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs b/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs index 2135f5c0..dd43c0cd 100644 --- a/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs +++ b/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs @@ -8,6 +8,7 @@ using System.Windows.Input; using DynamicData.Binding; using MahApps.Metro.Controls; using Microsoft.Extensions.Logging; +using NLog; using ReactiveUI; using Wabbajack.Common; using Wabbajack.Messages; @@ -144,7 +145,10 @@ namespace Wabbajack private void UIElement_OnMouseDown(object sender, MouseButtonEventArgs e) { - this.DragMove(); + if (e.LeftButton == MouseButtonState.Pressed) + { + this.DragMove(); + } } }