diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-05 17:15:57 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-05 17:15:57 +0300 |
| commit | e29b3605c31e2e1cbbc932ce75b327f98b70f513 (patch) | |
| tree | 6f6c3bd3aeb51935e270b2e281583fe4a48d7078 /indra/newview/lltoastnotifypanel.cpp | |
| parent | 611e0a2e38d624ed22270f2148323c320df5cc39 (diff) | |
SL-11315 Viewer asks to play media and retains selected choice
Diffstat (limited to 'indra/newview/lltoastnotifypanel.cpp')
| -rw-r--r-- | indra/newview/lltoastnotifypanel.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index 83009a78d4..bccf88128d 100644 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -163,6 +163,11 @@ void LLToastNotifyPanel::updateButtonsLayout(const std::vector<index_button_pair { left = (max_width - btn_rect.getWidth()) / 2; } + else if (left == 0 && buttons.size() == 2) + { + // Note: this and "size() == 1" shouldn't be inside the cycle, might be good idea to refactor whole placing process + left = (max_width - (btn_rect.getWidth() * 2) - h_pad) / 2; + } else if (left + btn_rect.getWidth() > max_width)// whether there is still some place for button+h_pad in the mControlPanel { // looks like we need to add button to the next row @@ -412,7 +417,7 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images ) mInfoPanel->setFollowsAll(); // Add checkbox (one of couple types) if nessesary. - setCheckBoxes(HPAD * 3, 0, mInfoPanel); + setCheckBoxes(HPAD * 2, 0, mInfoPanel); if (mCheck) { mCheck->setFollows(FOLLOWS_BOTTOM | FOLLOWS_LEFT); |