From 0312156258f962108ce485c4be95992555b09b32 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Fri, 25 Dec 2009 13:53:11 +0200 Subject: Fixed low bug EXT-3294 - Toasts bunch up in the channel when big docked IM window is opened. --HG-- branch : product-engine --- indra/llui/lldockablefloater.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'indra/llui/lldockablefloater.h') diff --git a/indra/llui/lldockablefloater.h b/indra/llui/lldockablefloater.h index 2c339f4a3f..2c0a484cc8 100644 --- a/indra/llui/lldockablefloater.h +++ b/indra/llui/lldockablefloater.h @@ -85,6 +85,14 @@ public: LLDockControl* getDockControl(); + /** + * Returns true if screen channel should consider floater's size when drawing toasts. + * + * By default returns false. + */ + virtual bool overlapsScreenChannel() { return mOverlapsScreenChannel && getVisible() && isDocked(); } + virtual void setOverlapsScreenChannel(bool overlaps) { mOverlapsScreenChannel = overlaps; } + private: /** * Provides unique of dockable floater. @@ -105,6 +113,8 @@ private: * non exclusively. */ bool mUniqueDocking; + + bool mOverlapsScreenChannel; }; #endif /* LL_DOCKABLEFLOATER_H */ -- cgit v1.2.3 From 5383fb70c3a3b4abd1262825a5323cce5fb1a1e0 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Sat, 26 Dec 2009 12:04:55 +0200 Subject: =?UTF-8?q?Implemented=20EXT-1627=20=E2=80=9CNearby=20Chat=20windo?= =?UTF-8?q?w=20behavior=20needs=20clarification=E2=80=9D,=20made=20non-uni?= =?UTF-8?q?que=20docked=20floaters=20docks=20without=20dock=20tongue;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/llui/lldockablefloater.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/llui/lldockablefloater.h') diff --git a/indra/llui/lldockablefloater.h b/indra/llui/lldockablefloater.h index 2c0a484cc8..ae4f99e205 100644 --- a/indra/llui/lldockablefloater.h +++ b/indra/llui/lldockablefloater.h @@ -50,6 +50,16 @@ public: LOG_CLASS(LLDockableFloater); LLDockableFloater(LLDockControl* dockControl, const LLSD& key, const Params& params = getDefaultParams()); + + /** + * Constructor. + * @param dockControl a pointer to the doc control instance + * @param uniqueDocking - a flag defines is docking should work as tab(at one + * moment only one docked floater can be shown), also this flag defines is dock + * tongue should be used. + * @params key a floater key. + * @params params a floater parameters + */ LLDockableFloater(LLDockControl* dockControl, bool uniqueDocking, const LLSD& key, const Params& params = getDefaultParams()); virtual ~LLDockableFloater(); @@ -93,6 +103,7 @@ public: virtual bool overlapsScreenChannel() { return mOverlapsScreenChannel && getVisible() && isDocked(); } virtual void setOverlapsScreenChannel(bool overlaps) { mOverlapsScreenChannel = overlaps; } + bool getUniqueDocking() { return mUniqueDocking; } private: /** * Provides unique of dockable floater. -- cgit v1.2.3