Skip to content
Snippets Groups Projects
Commit 31e08f5a authored by richard's avatar richard
Browse files

more/less button sorta working

parent 48a66364
No related branches found
No related tags found
No related merge requests found
...@@ -83,20 +83,20 @@ LLPanelNearByMedia::LLPanelNearByMedia() ...@@ -83,20 +83,20 @@ LLPanelNearByMedia::LLPanelNearByMedia()
{ {
mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING); mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING);
mCommitCallbackRegistrar.add("MediaListCtrl.EnableAll", boost::bind(&LLFloaterNearbyMedia::onClickEnableAll, this)); mCommitCallbackRegistrar.add("MediaListCtrl.EnableAll", boost::bind(&LLPanelNearByMedia::onClickEnableAll, this));
mCommitCallbackRegistrar.add("MediaListCtrl.DisableAll", boost::bind(&LLFloaterNearbyMedia::onClickDisableAll, this)); mCommitCallbackRegistrar.add("MediaListCtrl.DisableAll", boost::bind(&LLPanelNearByMedia::onClickDisableAll, this));
mCommitCallbackRegistrar.add("MediaListCtrl.GoMediaPrefs", boost::bind(&LLFloaterNearbyMedia::onAdvancedButtonClick, this)); mCommitCallbackRegistrar.add("MediaListCtrl.GoMediaPrefs", boost::bind(&LLPanelNearByMedia::onAdvancedButtonClick, this));
mCommitCallbackRegistrar.add("MediaListCtrl.MoreLess", boost::bind(&LLFloaterNearbyMedia::onMoreLess, this)); mCommitCallbackRegistrar.add("MediaListCtrl.MoreLess", boost::bind(&LLPanelNearByMedia::onMoreLess, this));
mCommitCallbackRegistrar.add("ParcelMediaCtrl.ParcelMediaVolume", boost::bind(&LLFloaterNearbyMedia::onParcelMediaVolumeSlider, this)); mCommitCallbackRegistrar.add("ParcelMediaCtrl.ParcelMediaVolume", boost::bind(&LLPanelNearByMedia::onParcelMediaVolumeSlider, this));
mCommitCallbackRegistrar.add("ParcelMediaCtrl.MuteParcelMedia", boost::bind(&LLFloaterNearbyMedia::onClickMuteParcelMedia, this)); mCommitCallbackRegistrar.add("ParcelMediaCtrl.MuteParcelMedia", boost::bind(&LLPanelNearByMedia::onClickMuteParcelMedia, this));
mCommitCallbackRegistrar.add("ParcelMediaCtrl.EnableParcelMedia", boost::bind(&LLFloaterNearbyMedia::onClickEnableParcelMedia, this)); mCommitCallbackRegistrar.add("ParcelMediaCtrl.EnableParcelMedia", boost::bind(&LLPanelNearByMedia::onClickEnableParcelMedia, this));
mCommitCallbackRegistrar.add("ParcelMediaCtrl.DisableParcelMedia", boost::bind(&LLFloaterNearbyMedia::onClickDisableParcelMedia, this)); mCommitCallbackRegistrar.add("ParcelMediaCtrl.DisableParcelMedia", boost::bind(&LLPanelNearByMedia::onClickDisableParcelMedia, this));
mCommitCallbackRegistrar.add("ParcelMediaCtrl.Play", boost::bind(&LLFloaterNearbyMedia::onClickParcelMediaPlay, this)); mCommitCallbackRegistrar.add("ParcelMediaCtrl.Play", boost::bind(&LLPanelNearByMedia::onClickParcelMediaPlay, this));
mCommitCallbackRegistrar.add("ParcelMediaCtrl.Stop", boost::bind(&LLFloaterNearbyMedia::onClickParcelMediaStop, this)); mCommitCallbackRegistrar.add("ParcelMediaCtrl.Stop", boost::bind(&LLPanelNearByMedia::onClickParcelMediaStop, this));
mCommitCallbackRegistrar.add("ParcelMediaCtrl.Pause", boost::bind(&LLFloaterNearbyMedia::onClickParcelMediaPause, this)); mCommitCallbackRegistrar.add("ParcelMediaCtrl.Pause", boost::bind(&LLPanelNearByMedia::onClickParcelMediaPause, this));
mCommitCallbackRegistrar.add("ParcelAudioCtrl.Play", boost::bind(&LLFloaterNearbyMedia::onClickParcelAudioPlay, this)); mCommitCallbackRegistrar.add("ParcelAudioCtrl.Play", boost::bind(&LLPanelNearByMedia::onClickParcelAudioPlay, this));
mCommitCallbackRegistrar.add("ParcelAudioCtrl.Stop", boost::bind(&LLFloaterNearbyMedia::onClickParcelAudioStop, this)); mCommitCallbackRegistrar.add("ParcelAudioCtrl.Stop", boost::bind(&LLPanelNearByMedia::onClickParcelAudioStop, this));
mCommitCallbackRegistrar.add("ParcelAudioCtrl.Pause", boost::bind(&LLFloaterNearbyMedia::onClickParcelAudioPause, this)); mCommitCallbackRegistrar.add("ParcelAudioCtrl.Pause", boost::bind(&LLPanelNearByMedia::onClickParcelAudioPause, this));
LLUICtrlFactory::instance().buildPanel(this, "panel_nearby_media.xml"); LLUICtrlFactory::instance().buildPanel(this, "panel_nearby_media.xml");
} }
...@@ -651,7 +651,7 @@ void LLPanelNearByMedia::onClickEnableAll() ...@@ -651,7 +651,7 @@ void LLPanelNearByMedia::onClickEnableAll()
onClickParcelAudioPlay(); onClickParcelAudioPlay();
} }
void LLFloaterNearbyMedia::onClickDisableAll() void LLPanelNearByMedia::onClickDisableAll()
{ {
LLViewerMedia::setAllMediaEnabled(false); LLViewerMedia::setAllMediaEnabled(false);
// Parcel Audio, too // Parcel Audio, too
...@@ -799,7 +799,7 @@ bool LLPanelNearByMedia::shouldShow(LLViewerMediaImpl* impl) ...@@ -799,7 +799,7 @@ bool LLPanelNearByMedia::shouldShow(LLViewerMediaImpl* impl)
return true; return true;
} }
void LLFloaterNearbyMedia::onAdvancedButtonClick() void LLPanelNearByMedia::onAdvancedButtonClick()
{ {
// bring up the prefs floater // bring up the prefs floater
LLFloaterPreference* prefsfloater = dynamic_cast<LLFloaterPreference*>(LLFloaterReg::showInstance("preferences")); LLFloaterPreference* prefsfloater = dynamic_cast<LLFloaterPreference*>(LLFloaterReg::showInstance("preferences"));
...@@ -816,15 +816,18 @@ void LLFloaterNearbyMedia::onAdvancedButtonClick() ...@@ -816,15 +816,18 @@ void LLFloaterNearbyMedia::onAdvancedButtonClick()
} }
} }
void LLFloaterNearbyMedia::onMoreLess() void LLPanelNearByMedia::onMoreLess()
{ {
bool is_more = getChild<LLUICtrl>("more_less_btn")->getValue(); bool is_more = getChild<LLUICtrl>("more_less_btn")->getValue();
mNearbyMediaPanel->setVisible(is_more); mNearbyMediaPanel->setVisible(is_more);
// S32 new_height = mOriginalHeight; S32 new_height = mOriginalHeight;
// if (!is_more) new_height -= mNearbyMediaPanelHeight; if (!is_more) new_height -= mNearbyMediaPanelHeight;
//
// reshape(getRect().getWidth(), new_height, false); LLRect new_rect = getRect();
new_rect.mBottom = new_rect.mTop - new_height;
setShape(new_rect);
} }
// static // static
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
top_delta="30" top_delta="30"
right="-1" right="-1"
left="0" left="0"
height="375"> height="230">
<text <text
type="string" type="string"
length="1" length="1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment