summaryrefslogtreecommitdiff
path: root/indra/llui/llview.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-08-14 01:06:48 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-08-14 01:06:48 +0300
commite67e9f63c30555467ac6a381e229e45150fb2509 (patch)
tree259d9e84ddac3cb5f8ebbf4b370d1c4a3930c8f7 /indra/llui/llview.cpp
parenta62a0fc62ce961dd570eefbe37eda51e50310df6 (diff)
SL-13293 Fixed reshape behavior for scale change
Diffstat (limited to 'indra/llui/llview.cpp')
-rw-r--r--indra/llui/llview.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 593c8b12fc..4a990cea81 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -1387,7 +1387,9 @@ void LLView::reshape(S32 width, S32 height, BOOL called_from_parent)
S32 delta_x = child_rect.mLeft - viewp->getRect().mLeft;
S32 delta_y = child_rect.mBottom - viewp->getRect().mBottom;
viewp->translate( delta_x, delta_y );
- if (child_rect.getWidth() != viewp->getRect().getWidth() || child_rect.getHeight() != viewp->getRect().getHeight())
+ if (child_rect.getWidth() != viewp->getRect().getWidth()
+ || child_rect.getHeight() != viewp->getRect().getHeight()
+ || sForceReshape)
{
viewp->reshape(child_rect.getWidth(), child_rect.getHeight());
}