From 13dd7431a350fc2515a6b7f30995fbc47f1bc77b Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Mon, 7 Dec 2009 15:44:44 +0200 Subject: Implemented normal task EXT-3084 (Update Notifications window behavior). - Added hiding window when focus is lost. --HG-- branch : product-engine --- indra/newview/llsyswellwindow.cpp | 6 ++++++ indra/newview/llsyswellwindow.h | 5 +++++ 2 files changed, 11 insertions(+) (limited to 'indra') diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index e5a4b456a0..18877e3895 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -174,6 +174,12 @@ void LLSysWellWindow::setVisible(BOOL visible) } } +//--------------------------------------------------------------------------------- +void LLSysWellWindow::onFocusLost() +{ + setVisible(false); +} + //--------------------------------------------------------------------------------- void LLSysWellWindow::setDocked(bool docked, bool pop_on_undock) { diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h index d2c494bfe8..18715ceeb5 100644 --- a/indra/newview/llsyswellwindow.h +++ b/indra/newview/llsyswellwindow.h @@ -73,6 +73,11 @@ public: // override LLFloater's minimization according to EXT-1216 /*virtual*/ void setMinimized(BOOL minimize); + /** + * Hides window when user clicks away from it (EXT-3084) + */ + /*virtual*/ void onFocusLost(); + void onStartUpToastClick(S32 x, S32 y, MASK mask); // size constants for the window and for its elements -- cgit v1.2.3 From d5bc38ae2db2d482db3e3fb83a0d9b917c6d4eb4 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Mon, 7 Dec 2009 15:59:49 +0200 Subject: Work on normal task EXT-3148 (Implement updating of the IM Well message counter). Fixed Linux build -- move constats into class --HG-- branch : product-engine --- indra/newview/llsyswellwindow.cpp | 4 ---- indra/newview/llsyswellwindow.h | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'indra') diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index 18877e3895..f64cd4727b 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -45,10 +45,6 @@ #include "lltoastpanel.h" #include "llnotificationmanager.h" - -static std::string NOTIFICATION_WELL_ANCHOR_NAME = "notification_well_panel"; -static std::string IM_WELL_ANCHOR_NAME = "im_well_panel"; - //--------------------------------------------------------------------------------- LLSysWellWindow::LLSysWellWindow(const LLSD& key) : LLDockableFloater(NULL, key), mChannel(NULL), diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h index 18715ceeb5..adbc83677d 100644 --- a/indra/newview/llsyswellwindow.h +++ b/indra/newview/llsyswellwindow.h @@ -47,8 +47,6 @@ class LLFlatListView; class LLChiclet; class LLIMChiclet; -extern std::string NOTIFICATION_WELL_ANCHOR_NAME; -extern std::string IM_WELL_ANCHOR_NAME; class LLSysWellWindow : public LLDockableFloater @@ -101,6 +99,8 @@ protected: void handleItemRemoved(EItemType removed_item_type); bool anotherTypeExists(EItemType item_type) ; + const std::string NOTIFICATION_WELL_ANCHOR_NAME; + const std::string IM_WELL_ANCHOR_NAME; virtual const std::string& getAnchorViewName() = 0; void reshapeWindow(); -- cgit v1.2.3