diff options
author | Oz Linden <oz@lindenlab.com> | 2012-03-30 13:31:26 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-03-30 13:31:26 -0400 |
commit | e56ea836383bd357809f86e2ffebafee8f481222 (patch) | |
tree | 8b5dd20b28261fba8b33953ef0f522914b2252c0 /indra/llui/llwindowshade.cpp | |
parent | 6f71df192720ec3f16e7e7102ad21f4d140b8e07 (diff) | |
parent | e60dac5ce486f55fe69949a6a3a2949d4f868193 (diff) |
merge changes for latest core and updates from Kitty
Diffstat (limited to 'indra/llui/llwindowshade.cpp')
-rw-r--r-- | indra/llui/llwindowshade.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/llui/llwindowshade.cpp b/indra/llui/llwindowshade.cpp index ae8b30b1ba..f5c463c961 100644 --- a/indra/llui/llwindowshade.cpp +++ b/indra/llui/llwindowshade.cpp @@ -160,7 +160,7 @@ void LLWindowShade::draw() notification_area->reshape(notification_area->getRect().getWidth(), llclamp(message_rect.getHeight() + 15, - llmin(mFormHeight, MAX_NOTIFICATION_AREA_HEIGHT), + llmax(mFormHeight, MIN_NOTIFICATION_AREA_HEIGHT), MAX_NOTIFICATION_AREA_HEIGHT)); LLUICtrl::draw(); @@ -176,12 +176,12 @@ void LLWindowShade::draw() { hide(); } - else if (notification_area->getCollapseFactor() < 0.01f) + else if (notification_area->getVisibleAmount() < 0.01f) { displayLatestNotification(); } - if (!notification_area->getVisible() && (notification_area->getCollapseFactor() < 0.001f)) + if (!notification_area->getVisible() && (notification_area->getVisibleAmount() < 0.001f)) { getChildRef<LLLayoutPanel>("background_area").setBackgroundVisible(false); setMouseOpaque(false); @@ -371,6 +371,11 @@ void LLWindowShade::setTextColor(LLColor4 color) getChild<LLTextBox>("notification_text")->setColor(color); } +bool LLWindowShade::isShown() const +{ + return getChildRef<LLLayoutPanel>("notification_area").getVisible(); +} + void LLWindowShade::setCanClose(bool can_close) { getChildView("close_panel")->setVisible(can_close); |