livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed EXT-5418 “When UI scale is set to 1.40 I see notices off the edge of the screen.”, 

corrected emitting of world view update signal;
replaced getWorldViewRectRaw with getWorldViewRectScaled LLIMFloater::getAllowedRect;

--HG--
branch : product-engine
meow-7.2.2
Alexei Arabadji 2010-02-22 18:23:04 +02:00
parent f15151428c
commit a7d716c35e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llimfloater.cpp
View File

@ -442,7 +442,7 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
void LLIMFloater::getAllowedRect(LLRect& rect)
{
rect = gViewerWindow->getWorldViewRectRaw();
rect = gViewerWindow->getWorldViewRectScaled();
static S32 right_padding = 0;
if (right_padding == 0)
{

5
indra/newview/llviewerwindow.cpp
View File

@ -3008,17 +3008,16 @@ void LLViewerWindow::updateWorldViewRect(bool use_full_window)
if (mWorldViewRectRaw != new_world_rect)
{
LLRect old_world_rect = mWorldViewRectRaw;
mWorldViewRectRaw = new_world_rect;
gResizeScreenTexture = TRUE;
LLViewerCamera::getInstance()->setViewHeightInPixels( mWorldViewRectRaw.getHeight() );
LLViewerCamera::getInstance()->setAspect( getWorldViewAspectRatio() );
LLRect old_world_rect_scaled = mWorldViewRectScaled;
mWorldViewRectScaled = calcScaledRect(mWorldViewRectRaw, mDisplayScale);
// sending a signal with a new WorldView rect
old_world_rect = calcScaledRect(old_world_rect, mDisplayScale);
mOnWorldViewRectUpdated(old_world_rect, mWorldViewRectScaled);
mOnWorldViewRectUpdated(old_world_rect_scaled, mWorldViewRectScaled);
}
}