From cb94cb4f9f7e9b6c25bbd5a86397a1f109a6c092 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Sun, 6 Dec 2015 16:26:39 +0200 Subject: [PATCH] Fixed: Scrolling in small steps not working. --HG-- branch : develop --- code/nel/include/nel/gui/ctrl_scroll.h | 2 +- code/nel/src/gui/ctrl_scroll.cpp | 32 ++++++++++---------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/code/nel/include/nel/gui/ctrl_scroll.h b/code/nel/include/nel/gui/ctrl_scroll.h index b01a3bf81..cf01ada78 100644 --- a/code/nel/include/nel/gui/ctrl_scroll.h +++ b/code/nel/include/nel/gui/ctrl_scroll.h @@ -147,7 +147,7 @@ namespace NLGUI sint32 _Aligned; // 0-Top 1-Bottom 2-Left 3-Right sint32 _TrackDispPos; - sint32 _TrackPos; + float _TrackPos; sint32 _TrackSize; sint32 _TrackSizeMin; diff --git a/code/nel/src/gui/ctrl_scroll.cpp b/code/nel/src/gui/ctrl_scroll.cpp index da42cd40b..d0d7483b3 100644 --- a/code/nel/src/gui/ctrl_scroll.cpp +++ b/code/nel/src/gui/ctrl_scroll.cpp @@ -653,8 +653,7 @@ namespace NLGUI factor = -(float)_Target->getOfsY() / factor; if (factor < 0.0f) factor = 0.0f; if (factor > 1.0f) factor = 1.0f; - factor = factor * (getHReal()-_TrackSize); - _TrackPos = (sint32)factor; + _TrackPos = factor * (getHReal()-_TrackSize); } else // TOP { @@ -663,8 +662,7 @@ namespace NLGUI if (factor < 0.0f) factor = 0.0f; if (factor > 1.0f) factor = 1.0f; sint32 hreal = getHReal(); - factor = (1.0f-factor) * (hreal - _TrackSize); - _TrackPos = (sint32)factor; + _TrackPos = (1.0f-factor) * (hreal - _TrackSize); } } @@ -712,8 +710,7 @@ namespace NLGUI factor = -(float)_Target->getOfsX() / factor; if (factor < 0.0f) factor = 0.0f; if (factor > 1.0f) factor = 1.0f; - factor = factor * (getWReal()-_TrackSize); - _TrackPos = (sint32)factor; + _TrackPos = factor * (getWReal()-_TrackSize); } else // RIGHT { @@ -722,8 +719,7 @@ namespace NLGUI if (factor < 0.0f) factor = 0.0f; if (factor > 1.0f) factor = 1.0f; sint32 hreal = getWReal(); - factor = (1.0f-factor) * (hreal - _TrackSize); - _TrackPos = (sint32)factor; + _TrackPos = (1.0f-factor) * (hreal - _TrackSize); } } @@ -930,8 +926,8 @@ namespace NLGUI if ((getWReal()-_TrackSize) <= 0) return 0; - sint32 newtpos; - sint32 tpos = _TrackPos; + float newtpos; + float tpos = _TrackPos; sint32 tsize = _TrackSize; // Limit the scroller to the defined area @@ -998,8 +994,8 @@ namespace NLGUI if ((getHReal()-_TrackSize) <= 0) return 0; - sint32 newtpos; - sint32 tpos = _TrackPos; + float newtpos; + float tpos = _TrackPos; sint32 tsize = _TrackSize; // Limit the scroller to the defined area @@ -1202,16 +1198,14 @@ namespace NLGUI float factor = (float)(wReal-maxWReal); factor = -(float)ofsX / factor; clamp(factor, 0.f, 1.f); - factor = factor * (getWReal()-_TrackSize); - _TrackPos = (sint32)factor; + _TrackPos = factor * (getWReal()-_TrackSize); } else // RIGHT { float factor = (float)(wReal-maxWReal); factor = (float)ofsX / factor; clamp(factor, 0.f, 1.f); - factor = (1.0f-factor) * (getWReal() - _TrackSize); - _TrackPos = (sint32)factor; + _TrackPos = (1.0f-factor) * (getWReal() - _TrackSize); } // invalidate only position. 1 pass is sufficient @@ -1240,8 +1234,7 @@ namespace NLGUI float factor = (float)(hReal-maxHReal); factor = -(float)ofsY / factor; clamp(factor, 0.f, 1.f); - factor = factor * (getHReal()-_TrackSize); - _TrackPos = (sint32)factor; + _TrackPos = factor * (getHReal()-_TrackSize); } else // TOP { @@ -1250,8 +1243,7 @@ namespace NLGUI float factor = (float)(hReal-maxHReal); factor = (float)ofsY / factor; clamp(factor, 0.f, 1.f); - factor = (1.0f-factor) * (getHReal() - _TrackSize); - _TrackPos = (sint32)factor; + _TrackPos = (1.0f-factor) * (getHReal() - _TrackSize); } // invalidate only position. 1 pass is sufficient