SL-15232: Fix top/right edges of main map not being scrollable
parent
d3a616122f
commit
288fbe2317
|
|
@ -405,13 +405,13 @@ BOOL LLFloaterWorldMap::handleScrollWheel(S32 x, S32 y, S32 clicks)
|
|||
{
|
||||
if (!isMinimized() && isFrontmost())
|
||||
{
|
||||
if (mPanel->pointInView(x, y))
|
||||
S32 map_x = x - mPanel->getRect().mLeft;
|
||||
S32 map_y = y - mPanel->getRect().mBottom;
|
||||
if (mPanel->pointInView(map_x, map_y))
|
||||
{
|
||||
F32 old_slider_zoom = (F32)getChild<LLUICtrl>("zoom slider")->getValue().asReal();
|
||||
F32 slider_zoom = old_slider_zoom + ((F32)clicks * -0.3333f);
|
||||
getChild<LLUICtrl>("zoom slider")->setValue(LLSD(slider_zoom));
|
||||
S32 map_x = x - mPanel->getRect().mLeft;
|
||||
S32 map_y = y - mPanel->getRect().mBottom;
|
||||
LLWorldMapView::zoomWithPivot(slider_zoom, map_x, map_y);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue