Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

onVisibilityChange renamed to handleVisibilityChange. Added setVisibleCallback to LLPanel

Browse Source
This commit is contained in:
Shyotl
2011-10-14 22:57:35 -05:00
parent d6d8681874
commit 4a910a8037
4 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llmediactrl.cpp
View File

@@ -63,7 +63,7 @@ const S32 MAX_TEXTURE_DIMENSION = 2048;
static LLRegisterWidget<LLMediaCtrl> r("web_browser");
LLMediaCtrl::LLMediaCtrl( const std::string& name, const LLRect& rect ) :
LLUICtrl( name, rect, FALSE, NULL, NULL ),
LLPanel( name, rect, FALSE ),
LLInstanceTracker<LLMediaCtrl, LLUUID>(LLUUID::generateNewID()),
mTextureDepthBytes( 4 ),
mWebBrowserImage( 0 ),
@@ -336,6 +336,15 @@ void LLMediaCtrl::onFocusLost()
LLUICtrl::onFocusLost();
}
////////////////////////////////////////////////////////////////////////////////
//
BOOL LLMediaCtrl::postBuild ()
{
setVisibleCallback(boost::bind(&LLMediaCtrl::onVisibilityChange, this, _2));
return true;
}
////////////////////////////////////////////////////////////////////////////////
//
BOOL LLMediaCtrl::handleKeyHere( KEY key, MASK mask )
@@ -390,6 +399,7 @@ void LLMediaCtrl::handleVisibilityChange ( BOOL new_visibility )
////////////////////////////////////////////////////////////////////////////////
//
BOOL LLMediaCtrl::handleUnicodeCharHere(llwchar uni_char)
{
BOOL result = FALSE;
@@ -407,10 +417,10 @@ BOOL LLMediaCtrl::handleUnicodeCharHere(llwchar uni_char)
////////////////////////////////////////////////////////////////////////////////
//
void LLMediaCtrl::handleVisibilityChange ( BOOL new_visibility )
void LLMediaCtrl::onVisibilityChange ( const LLSD& new_visibility )
{
// set state of frequent updates automatically if visibility changes
if ( new_visibility )
if ( new_visibility.asBoolean() )
{
mFrequentUpdates = true;
}
@@ -418,7 +428,6 @@ void LLMediaCtrl::handleVisibilityChange ( BOOL new_visibility )
{
mFrequentUpdates = false;
}
LLUICtrl::handleVisibilityChange(new_visibility);
}
////////////////////////////////////////////////////////////////////////////////

5
indra/newview/llmediactrl.h
View File

@@ -46,7 +46,7 @@ class LLUICtrlFactory;
////////////////////////////////////////////////////////////////////////////////
//
class LLMediaCtrl :
public LLUICtrl,
public LLPanel,
public LLViewerMediaObserver,
public LLViewerMediaEventEmitter,
public LLInstanceTracker<LLMediaCtrl, LLUUID>
@@ -133,7 +133,7 @@ class LLMediaCtrl :
virtual BOOL handleUnicodeCharHere(llwchar uni_char);
virtual void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE);
virtual void draw();
virtual void handleVisibilityChange ( BOOL curVisibilityIn );
virtual BOOL postBuild();
// focus overrides
void onFocusLost();
@@ -150,6 +150,7 @@ class LLMediaCtrl :
void convertInputCoords(S32& x, S32& y);
private:
void onVisibilityChange ( const LLSD& new_visibility );
static bool onClickLinkExternalTarget( const LLSD&, const LLSD& );
const S32 mTextureDepthBytes;