From 36aca68e403417ccc41ec811b09e05e94715f01d Mon Sep 17 00:00:00 2001
From: Dick Hollenbeck <dick@softplc.com>
Date: Sun, 9 Jun 2013 13:14:01 -0500
Subject: [PATCH] fix autopan non-response problem when dragging block to right
 or bottom

---
 common/drawpanel.cpp  | 6 +++---
 eeschema/schframe.cpp | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/drawpanel.cpp b/common/drawpanel.cpp
index 47c2996935..5cde632226 100644
--- a/common/drawpanel.cpp
+++ b/common/drawpanel.cpp
@@ -830,11 +830,11 @@ void EDA_DRAW_PANEL::OnMouseLeaving( wxMouseEvent& event )
     if( !m_enableAutoPan || !m_requestAutoPan || m_ignoreMouseEvents )
         return;
 
-    // Auto pan if mouse is leave working area:
+    // Auto pan if mouse has left the client window
     wxSize size = GetClientSize();
 
-    if( ( size.x < event.GetX() ) || ( size.y < event.GetY() )
-       || ( event.GetX() <= 0) || ( event.GetY() <= 0 ) )
+    if( size.x <= event.GetX() || event.GetX() < 0 ||
+        size.y <= event.GetY() || event.GetY() < 0 )
     {
         wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED, ID_POPUP_ZOOM_CENTER );
         cmd.SetEventObject( this );
diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp
index f22cbcbb33..7f61b55171 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -604,11 +604,12 @@ void SCH_EDIT_FRAME::OnAnnotate( wxCommandEvent& event )
 
 void SCH_EDIT_FRAME::OnErc( wxCommandEvent& event )
 {
-    // See if its already open...
+    // See if it's already open...
     wxWindow* erc = FindWindowById( ID_DIALOG_ERC, this );
 
     if( erc )
-        erc->Raise();       // bring it to the top if already open.
+        // Bring it to the top if already open.  Dual monitor users need this.
+        erc->Raise();
     else
         InvokeDialogERC( this );
 }