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

EXP-1651 FIXED Added saving window size after each reshape. 

Fixed broken resize indicator on Linux viewer window (EXP-1580).
meow-7.2.2
Seth ProductEngine 2011-12-06 21:43:58 +02:00
parent 2be10e8660
commit 1c71b90300
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llwindow/llwindowsdl.cpp
View File

@ -1034,9 +1034,9 @@ void LLWindowSDL::setMouseClipping( BOOL b )
}
// virtual
void LLWindowSDL::setMinSize(U32 min_width, U32 min_height)
void LLWindowSDL::setMinSize(U32 min_width, U32 min_height, bool enforce_immediately)
{
LLWindow::setMinSize(min_width, min_height);
LLWindow::setMinSize(min_width, min_height, enforce_immediately);
#if LL_X11
// Set the minimum size limits for X11 window

2
indra/llwindow/llwindowsdl.h
View File

@ -76,7 +76,7 @@ public:
/*virtual*/ void captureMouse();
/*virtual*/ void releaseMouse();
/*virtual*/ void setMouseClipping( BOOL b );
/*virtual*/ void setMinSize(U32 min_width, U32 min_height);
/*virtual*/ void setMinSize(U32 min_width, U32 min_height, bool enforce_immediately = true);
/*virtual*/ BOOL isClipboardTextAvailable();
/*virtual*/ BOOL pasteTextFromClipboard(LLWString &dst);

5
indra/newview/llviewerwindow.cpp
View File

@ -2140,7 +2140,6 @@ void LLViewerWindow::reshape(S32 width, S32 height)
sendShapeToSim();
// store new settings for the mode we are in, regardless
// Only save size if not maximized
BOOL maximized = mWindow->getMaximized();
gSavedSettings.setBOOL("WindowMaximized", maximized);
@ -2150,6 +2149,10 @@ void LLViewerWindow::reshape(S32 width, S32 height)
U32 min_window_height=gSavedSettings.getU32("MinWindowHeight");
// tell the OS specific window code about min window size
mWindow->setMinSize(min_window_width, min_window_height);
// Only save size if not maximized
gSavedSettings.setU32("WindowWidth", mWindowRectRaw.getWidth());
gSavedSettings.setU32("WindowHeight", mWindowRectRaw.getHeight());
}
LLViewerStats::getInstance()->setStat(LLViewerStats::ST_WINDOW_WIDTH, (F64)width);