From bb3abe5c17c92fec08da5490c3d66b411d25eacd Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Wed, 7 Apr 2010 10:49:12 +0300
Subject: [PATCH] fixed EXT-5842 There is a lot of unused space in the
online/offline toasts, - decreased on/offline notification toasts width from
305 to 220px; - added toast right alignment; - made toasts for long avatar
names taller (according to max length of avatar full name(63 characters) made
3 max line of message text in online/offline toasts, also corrected initial
geometry parameters of panel_online_status_toast.xml to allow method
LLToastPanel::snapToMessageHeigh works correctly);
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/182/
--HG--
branch : product-engine
---
indra/newview/llnotificationtiphandler.cpp | 4 ++--
indra/newview/llscreenchannel.cpp | 4 +++-
.../skins/default/xui/en/panel_online_status_toast.xml | 8 ++++----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp
index 1f1afe293aa..afc00bf7ef3 100644
--- a/indra/newview/llnotificationtiphandler.cpp
+++ b/indra/newview/llnotificationtiphandler.cpp
@@ -71,8 +71,8 @@ class LLOnlineStatusToast : public LLToastPanel
p.notification->getResponseTemplate()));
}
- // set line max count to 2 in case of a very long name
- snapToMessageHeight(getChild<LLTextBox>("message"), 2);
+ // set line max count to 3 in case of a very long name
+ snapToMessageHeight(getChild<LLTextBox>("message"), 3);
}
};
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index dffb5e5e123..e9a80907b76 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -480,7 +480,9 @@ void LLScreenChannel::showToastsBottom()
}
toast_rect = (*it).toast->getRect();
- toast_rect.setOriginAndSize(getRect().mLeft, bottom + toast_margin, toast_rect.getWidth() ,toast_rect.getHeight());
+ toast_rect.setOriginAndSize(getRect().mRight - toast_rect.getWidth(),
+ bottom + toast_margin, toast_rect.getWidth(),
+ toast_rect.getHeight());
(*it).toast->setRect(toast_rect);
if(floater && floater->overlapsScreenChannel())
diff --git a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
index 14cb5fffee2..b1a7697e833 100644
--- a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="false"
- height="152"
+ height="40"
label="friend_online_status"
layout="topleft"
left="0"
name="friend_online_status"
top="0"
- width="305">
+ width="220">
<avatar_icon
follows="top|left"
height="18"
@@ -21,7 +21,7 @@
<text
font="SansSerifSmall"
follows="all"
- height="137"
+ height="13"
layout="topleft"
left_pad="5"
name="message"
@@ -29,7 +29,7 @@
top="15"
use_ellipses="true"
value=""
- width="285"
+ width="189"
word_wrap="true"
max_length="350" />
</panel>
\ No newline at end of file
--
GitLab