From 6a1db0a223e632d9902c516a069d0f01a160b839 Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Sun, 10 Jul 2011 19:10:51 -0700 Subject: [PATCH] Removed ClipCursor which prevented cursor from leaving client window. Disabled cursor being re-centered during progress screen. --- Sources/Plasma/Apps/plClient/plClient.cpp | 3 ++- Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp | 2 -- Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/plClient.cpp b/Sources/Plasma/Apps/plClient/plClient.cpp index 88fd43eb..0d531766 100644 --- a/Sources/Plasma/Apps/plClient/plClient.cpp +++ b/Sources/Plasma/Apps/plClient/plClient.cpp @@ -1286,6 +1286,8 @@ void plClient::IIncProgress (hsScalar byHowMuch, const char * text) //============================================================================ void plClient::IStartProgress( const char *title, hsScalar len ) { + plInputManager::SetRecenterMouse(false); + if (fProgressBar) { fProgressBar->SetLength(fProgressBar->GetMax()+len); @@ -2191,7 +2193,6 @@ void plClient::ResetDisplayDevice(int Width, int Height, int ColorDepth, hsBool else { SetWindowPos( fWindowHndl, HWND_TOP, 0, 0, Width, Height, flags ); - ::ClipCursor(nil); } WindowActivate(true); diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp index 16e08d1d..99bf7c9e 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp @@ -795,7 +795,6 @@ void plMouseDevice::HandleWindowActivate(bool bActive, HWND hWnd) // rect.bottom /= plInputManager::GetInstance()->GetMouseScale(); ::MapWindowPoints( hWnd, NULL, (POINT *)&rect, 2 ); - ::ClipCursor(&rect); ::ShowCursor( FALSE ); SetCapture(hWnd); @@ -803,7 +802,6 @@ void plMouseDevice::HandleWindowActivate(bool bActive, HWND hWnd) else { ReleaseCapture(); - ::ClipCursor(nil); ::ShowCursor( TRUE ); } } diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp index c21a964c..707fd3cb 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp @@ -547,7 +547,6 @@ void plDInputMgr::AddDevice(IDirectInputDevice8* device) void plDInputMgr::ConfigureDevice() { - ::ClipCursor(nil); ::ShowCursor( TRUE ); ReleaseCapture(); @@ -571,10 +570,6 @@ void plDInputMgr::ConfigureDevice() for (int i = 0; i < fDI->fSticks.Count(); i++) fDI->fSticks[i]->fDevice->SetActionMap( fDI->fActionFormat, NULL, DIDSAM_FORCESAVE ); - RECT rect; - ::GetClientRect(fhWnd,&rect); - ::ClientToScreen(fhWnd,(LPPOINT)&rect); - ::ClipCursor(&rect); ::ShowCursor( FALSE ); SetCapture(fhWnd);