diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-01 18:28:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 18:28:07 +0200 |
| commit | 43049bcff497df650c25897d640de9f038d87254 (patch) | |
| tree | c19376fa42061e5eee4e55d55cb8cb0a48e26fda /indra/llui/llscrollbar.cpp | |
| parent | 9f0faf5c892bba9703c713a29202a8ac48bfdf8b (diff) | |
| parent | faf69f407fa95d9dc19f6d737f606e18ab32d052 (diff) | |
Merge pull request #916 from secondlife/marchcat/yz-merge
emoji release -> maint yz merge
Diffstat (limited to 'indra/llui/llscrollbar.cpp')
| -rw-r--r-- | indra/llui/llscrollbar.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp index 735e2d529e..b2be9fb1e1 100644 --- a/indra/llui/llscrollbar.cpp +++ b/indra/llui/llscrollbar.cpp @@ -475,13 +475,15 @@ void LLScrollbar::reshape(S32 width, S32 height, BOOL called_from_parent) { up_button->reshape(up_button->getRect().getWidth(), llmin(getRect().getHeight() / 2, mThickness)); down_button->reshape(down_button->getRect().getWidth(), llmin(getRect().getHeight() / 2, mThickness)); - up_button->setOrigin(up_button->getRect().mLeft, getRect().getHeight() - up_button->getRect().getHeight()); + up_button->setOrigin(0, getRect().getHeight() - up_button->getRect().getHeight()); + down_button->setOrigin(0, 0); } else { up_button->reshape(llmin(getRect().getWidth() / 2, mThickness), up_button->getRect().getHeight()); down_button->reshape(llmin(getRect().getWidth() / 2, mThickness), down_button->getRect().getHeight()); - down_button->setOrigin(getRect().getWidth() - down_button->getRect().getWidth(), down_button->getRect().mBottom); + up_button->setOrigin(0, 0); + down_button->setOrigin(getRect().getWidth() - down_button->getRect().getWidth(), 0); } updateThumbRect(); } |