aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-27 09:36:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
Nimetu 2015-12-20 03:34:00 +02:00
parent 2c94ec2e2d
commit 03242fbc41
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/src/gui/ctrl_scroll.cpp
View file

@ -1135,7 +1135,7 @@ namespace NLGUI
factor = factor * (1.0f-(_TrackPos / favoid0((float)(getHReal()-_TrackSize)))); factor = factor * (1.0f-(_TrackPos / favoid0((float)(getHReal()-_TrackSize))));
// Compute Steped target // Compute Steped target
sint32 nexOfsY= (sint32) (_Inverted ? factor : -factor); sint32 nexOfsY= (sint32) floorf(0.5+(_Inverted ? factor : -factor));
if(_TargetStepY>1) if(_TargetStepY>1)
nexOfsY= ((nexOfsY+_TargetStepY/2)/_TargetStepY) * _TargetStepY; nexOfsY= ((nexOfsY+_TargetStepY/2)/_TargetStepY) * _TargetStepY;
_Target->setOfsY (nexOfsY); _Target->setOfsY (nexOfsY);
@ -1154,7 +1154,7 @@ namespace NLGUI
factor = factor * (1.0f-(_TrackPos / favoid0((float)(getWReal()-_TrackSize)))); factor = factor * (1.0f-(_TrackPos / favoid0((float)(getWReal()-_TrackSize))));
// Compute Steped target // Compute Steped target
sint32 nexOfsX= (sint32) (_Inverted ? factor : -factor); sint32 nexOfsX= (sint32) floorf(0.5+(_Inverted ? factor : -factor));
if(_TargetStepX>1) if(_TargetStepX>1)
nexOfsX= ((nexOfsX+_TargetStepX/2)/_TargetStepX) * _TargetStepX; nexOfsX= ((nexOfsX+_TargetStepX/2)/_TargetStepX) * _TargetStepX;
_Target->setOfsX (nexOfsX); _Target->setOfsX (nexOfsX);