diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-14 01:06:48 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-14 01:06:48 +0300 |
| commit | e67e9f63c30555467ac6a381e229e45150fb2509 (patch) | |
| tree | 259d9e84ddac3cb5f8ebbf4b370d1c4a3930c8f7 /indra/newview | |
| parent | a62a0fc62ce961dd570eefbe37eda51e50310df6 (diff) | |
SL-13293 Fixed reshape behavior for scale change
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llpanellogin.h | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 5 |
3 files changed, 16 insertions, 0 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 70757882d8..849b75773d 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -542,6 +542,16 @@ void LLPanelLogin::show(const LLRect &rect, } //static +void LLPanelLogin::reshapePanel() +{ + if (sInstance) + { + LLRect rect = sInstance->getRect(); + sInstance->reshape(rect.getWidth(), rect.getHeight()); + } +} + +//static void LLPanelLogin::populateFields(LLPointer<LLCredential> credential, bool remember_user, bool remember_psswrd) { if (!sInstance) diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h index c9b8e1b6fc..788c269ffd 100644 --- a/indra/newview/llpanellogin.h +++ b/indra/newview/llpanellogin.h @@ -54,6 +54,7 @@ public: static void show(const LLRect &rect, void (*callback)(S32 option, void* user_data), void* callback_data); + static void reshapePanel(); static void populateFields(LLPointer<LLCredential> credential, bool remember_user, bool remember_psswrd); static void resetFields(); diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 5dd3270b2e..c60a67f79d 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2407,6 +2407,11 @@ void LLViewerWindow::reshape(S32 width, S32 height) // round up when converting coordinates to make sure there are no gaps at edge of window LLView::sForceReshape = display_scale_changed; mRootView->reshape(llceil((F32)width / mDisplayScale.mV[VX]), llceil((F32)height / mDisplayScale.mV[VY])); + if (display_scale_changed) + { + // Needs only a 'scale change' update, everything else gets handled by LLLayoutStack::updateClass() + LLPanelLogin::reshapePanel(); + } LLView::sForceReshape = FALSE; // clear font width caches |