diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-25 15:59:37 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-25 15:59:37 -0500 |
| commit | 50b67f052a440fba54a05fe32320f6bb84ea43cc (patch) | |
| tree | e9716527ab736c1d5c92e0d1a4ee11cb071c522f /indra/llui/llwindowshade.cpp | |
| parent | c4e0c20cdccc0604a1688ab3664295c1944321e8 (diff) | |
| parent | 4ef9277761b5faee2825177112939b72c563a4ea (diff) | |
MERGE - pulling latest viewer-development into pathfinding branch
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); |