From b6a4914d2566de70c4eb3b120aae8cff864a91a5 Mon Sep 17 00:00:00 2001 From: Eusebiu Marcu Date: Tue, 30 Nov 2010 00:38:33 +0200 Subject: [PATCH] minor fix on method view --- .../Debugger.AddIn/Pads/ParallelPad/DrawSurface.xaml.cs | 8 +++----- .../Debugger.AddIn/Pads/ParallelPad/ParallelStackPad.cs | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/DrawSurface.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/DrawSurface.xaml.cs index fd9776a6a0..9fb8ca8a6c 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/DrawSurface.xaml.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/DrawSurface.xaml.cs @@ -6,6 +6,7 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Input; using System.Windows.Media; +using System.Windows.Shapes; namespace Debugger.AddIn.Pads.ParallelPad { @@ -53,7 +54,7 @@ namespace Debugger.AddIn.Pads.ParallelPad void DrawSurface_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e) { - if (e.OriginalSource is Slider || e.OriginalSource is Button) + if (e.OriginalSource is Shape || e.OriginalSource is TextBlock) return; dragStartedPoint = e.GetPosition(drawingSurface); @@ -65,7 +66,7 @@ namespace Debugger.AddIn.Pads.ParallelPad void DrawSurface_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) { drawingSurface.ReleaseMouseCapture(); - if (e.OriginalSource is Slider || e.OriginalSource is Button) + if (e.OriginalSource is Shape || e.OriginalSource is TextBlock) return; this.PreviewMouseMove -= DrawSurface_PreviewMouseMove; @@ -78,9 +79,6 @@ namespace Debugger.AddIn.Pads.ParallelPad if (e.LeftButton == MouseButtonState.Pressed) { - if (e.OriginalSource is Slider || e.OriginalSource is Button) - return; - Cursor = Cursors.SizeAll; var point = e.GetPosition(drawingSurface); Vector v = point - dragStartedPoint; diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/ParallelStackPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/ParallelStackPad.cs index 7d46d56f67..54dcc9ae32 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/ParallelStackPad.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/ParallelStackPad.cs @@ -530,7 +530,8 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads obj.IsRunningStackFrame = true; } else { - if (selectedFrame != null && frame.GetMethodName() == selectedFrame.GetMethodName()) + if (selectedFrame != null && frame.Thread.ID == selectedFrame.Thread.ID && + frame.GetMethodName() == selectedFrame.GetMethodName()) obj.Image = PresentationResourceService.GetImage("Icons.48x48.CurrentFrame").Source; else obj.Image = null;