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

EXP-1272 FIX Move "How To" to a separate web floater 

fixed title of how to window to always say "How To" instead of showing url
meow-7.2.2
Richard Nelson 2011-10-14 13:49:48 -07:00
parent c8fdc936b4
commit 172662ce2a
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llfloaterwebcontent.cpp
View File

@ -48,13 +48,15 @@ LLFloaterWebContent::_Params::_Params()
show_chrome("show_chrome", true),
allow_address_entry("allow_address_entry", true),
preferred_media_size("preferred_media_size"),
trusted_content("trusted_content", false)
trusted_content("trusted_content", false),
show_page_title("show_page_title", true)
{}
LLFloaterWebContent::LLFloaterWebContent( const Params& params )
: LLFloater( params ),
LLInstanceTracker<LLFloaterWebContent, std::string>(params.id()),
mUUID(params.id())
mUUID(params.id()),
mShowPageTitle(params.show_page_title)
{
mCommitCallbackRegistrar.add( "WebContent.Back", boost::bind( &LLFloaterWebContent::onClickBack, this ));
mCommitCallbackRegistrar.add( "WebContent.Forward", boost::bind( &LLFloaterWebContent::onClickForward, this ));
@ -359,10 +361,13 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
{
std::string page_title = self->getMediaName();
// simulate browser behavior - title is empty, use the current URL
if ( page_title.length() > 0 )
setTitle( page_title );
else
setTitle( mCurrentURL );
if (mShowPageTitle)
{
if ( page_title.length() > 0 )
setTitle( page_title );
else
setTitle( mCurrentURL );
}
}
else if(event == MEDIA_EVENT_LINK_HOVERED )
{

18
indra/newview/llfloaterwebcontent.h
View File

@ -53,7 +53,8 @@ public:
id;
Optional<bool> show_chrome,
allow_address_entry,
trusted_content;
trusted_content,
show_page_title;
Optional<LLRect> preferred_media_size;
_Params();
@ -91,13 +92,14 @@ protected:
void open_media(const Params& );
void set_current_url(const std::string& url);
LLMediaCtrl* mWebBrowser;
LLComboBox* mAddressCombo;
LLIconCtrl *mSecureLockIcon;
LLTextBox* mStatusBarText;
LLProgressBar* mStatusBarProgress;
std::string mCurrentURL;
std::string mUUID;
LLMediaCtrl* mWebBrowser;
LLComboBox* mAddressCombo;
LLIconCtrl* mSecureLockIcon;
LLTextBox* mStatusBarText;
LLProgressBar* mStatusBarProgress;
std::string mCurrentURL;
std::string mUUID;
bool mShowPageTitle;
};
#endif // LL_LLFLOATERWEBCONTENT_H