Merge pull request #301 from alfhenrik/master

Fixes Issue #244
MahApps · Jan 14, 2013 · 13df059 · 13df059
2 parents bd6aef6 + dac4987
commit 13df059
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/MahApps.Metro/Controls/Panorama.cs b/MahApps.Metro/Controls/Panorama.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows.Controls;
 using System.Windows;
 using System.Windows.Threading;
@@ -168,16 +168,14 @@ protected override void OnPreviewMouseDown(MouseButtonEventArgs e)
                         tile = (IPanoramaTile)data;
                     }
                 }
-
-                CaptureMouse();
             }
 
             base.OnPreviewMouseDown(e);
         }
 
         protected override void OnPreviewMouseMove(MouseEventArgs e)
         {
-            if (IsMouseCaptured)
+            if (e.LeftButton == MouseButtonState.Pressed)
             {
                 Point currentPoint = e.GetPosition(this);
 
@@ -194,6 +192,7 @@ protected override void OnPreviewMouseMove(MouseEventArgs e)
                 // Scroll to the new position.
                 sv.ScrollToHorizontalOffset(scrollTarget.X);
                 sv.ScrollToVerticalOffset(scrollTarget.Y);
+                CaptureMouse();
             }
 
             base.OnPreviewMouseMove(e);
@@ -203,10 +202,9 @@ protected override void OnPreviewMouseUp(MouseButtonEventArgs e)
         {
             if (IsMouseCaptured)
             {
-                Cursor = Cursors.Arrow;
                 ReleaseMouseCapture();
             }
-
+            Cursor = Cursors.Arrow;
             Point currentPoint = e.GetPosition(this);
 
             // Determine the new amount to scroll.