Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fix #162: Center ingame mouse cursor after login

Browse source
This commit is contained in:
kaetemi 2014-07-09 12:31:22 +02:00
parent 2efdca688e
commit 868ff2d106
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/include/nel/gui/view_pointer_base.h
View file

@ -53,12 +53,14 @@ namespace NLGUI
bool show() const {return _PointerVisible;} bool show() const {return _PointerVisible;}
void draw(){} void draw(){}
/// set button state /// set button state
void setButtonState(NLMISC::TMouseButton state) { _Buttons = state; } void setButtonState(NLMISC::TMouseButton state) { _Buttons = state; }
/// get buttons state /// get buttons state
NLMISC::TMouseButton getButtonState() const { return _Buttons; } NLMISC::TMouseButton getButtonState() const { return _Buttons; }
static const sint32 InvalidCoord = 0x80000000;
protected: protected:
// (x,y) is from the TopLeft corner of the window // (x,y) is from the TopLeft corner of the window
sint32 _PointerX; // Current pointer position (raw, before snapping) sint32 _PointerX; // Current pointer position (raw, before snapping)

2
code/nel/src/gui/view_pointer_base.cpp
View file

@ -25,7 +25,7 @@ namespace NLGUI
CViewBase( param ), CViewBase( param ),
_Buttons( NLMISC::noButton ) _Buttons( NLMISC::noButton )
{ {
_PointerX = _PointerY = _PointerOldX = _PointerOldY = _PointerDownX = _PointerDownY = 0; _PointerX = _PointerY = _PointerOldX = _PointerOldY = _PointerDownX = _PointerDownY = InvalidCoord;
_PointerDown = false; _PointerDown = false;
_PointerVisible = true; _PointerVisible = true;
} }

8
code/ryzom/client/src/input.cpp
View file

@ -263,7 +263,6 @@ bool IsMouseFreeLook()
return MouseFreeLook; return MouseFreeLook;
} }
// ********************************************************************************* // *********************************************************************************
// Use this method to toggle the mouse (freelook -> cursor) // Use this method to toggle the mouse (freelook -> cursor)
void SetMouseCursor (bool updatePos) void SetMouseCursor (bool updatePos)
@ -287,8 +286,11 @@ void SetMouseCursor (bool updatePos)
{ {
sint32 ix, iy; sint32 ix, iy;
cursor->getPointerPos (ix, iy); cursor->getPointerPos (ix, iy);
x = (float)ix / (float)width; if (ix != CViewPointer::InvalidCoord && iy != CViewPointer::InvalidCoord)
y = (float)iy / (float)height; {
x = (float)ix / (float)width;
y = (float)iy / (float)height;
}
} }
} }