livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed EXT-3428 “Undocked IM well closes after click on game area”, 

made LLIMWellWindow and LLNotificationWellWindow as dockable transient
floaters;

--HG--
branch : product-engine
meow-7.2.2
Alexei Arabadji 2009-12-28 15:56:52 +02:00
parent f694d2fea2
commit 5f44b76e22
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llsyswellwindow.cpp
View File

@ -52,7 +52,7 @@
#include "llspeakers.h"
//---------------------------------------------------------------------------------
LLSysWellWindow::LLSysWellWindow(const LLSD& key) : LLDockableFloater(NULL, key),
LLSysWellWindow::LLSysWellWindow(const LLSD& key) : LLTransientDockableFloater(NULL, true, key),
mChannel(NULL),
mMessageList(NULL),
mSysWellChiclet(NULL),
@ -90,13 +90,13 @@ BOOL LLSysWellWindow::postBuild()
// mouse up callback is not called in this case.
setMouseDownCallback(boost::bind(&LLSysWellWindow::releaseNewMessagesState, this));
return LLDockableFloater::postBuild();
return LLTransientDockableFloater::postBuild();
}
//---------------------------------------------------------------------------------
void LLSysWellWindow::setMinimized(BOOL minimize)
{
LLDockableFloater::setMinimized(minimize);
LLTransientDockableFloater::setMinimized(minimize);
}
//---------------------------------------------------------------------------------
@ -176,7 +176,7 @@ void LLSysWellWindow::setVisible(BOOL visible)
// do not show empty window
if (NULL == mMessageList || isWindowEmpty()) visible = FALSE;
LLDockableFloater::setVisible(visible);
LLTransientDockableFloater::setVisible(visible);
// update notification channel state
if(mChannel)
@ -191,16 +191,10 @@ void LLSysWellWindow::setVisible(BOOL visible)
}
}
//---------------------------------------------------------------------------------
void LLSysWellWindow::onFocusLost()
{
setVisible(false);
}
//---------------------------------------------------------------------------------
void LLSysWellWindow::setDocked(bool docked, bool pop_on_undock)
{
LLDockableFloater::setDocked(docked, pop_on_undock);
LLTransientDockableFloater::setDocked(docked, pop_on_undock);
// update notification channel state
if(mChannel)

9
indra/newview/llsyswellwindow.h
View File

@ -35,7 +35,7 @@
#include "llsyswellitem.h"
#include "lldockablefloater.h"
#include "lltransientdockablefloater.h"
#include "llbutton.h"
#include "llscreenchannel.h"
#include "llscrollcontainer.h"
@ -50,7 +50,7 @@ class LLScriptChiclet;
class LLSysWellChiclet;
class LLSysWellWindow : public LLDockableFloater
class LLSysWellWindow : public LLTransientDockableFloater
{
public:
LLSysWellWindow(const LLSD& key);
@ -72,11 +72,6 @@ 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);
void setSysWellChiclet(LLSysWellChiclet* chiclet) { mSysWellChiclet = chiclet; }