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

Hide floater until success/failure (or floater is re-opened)

Browse Source
This commit is contained in:
Aleric Inglewood
2013-01-12 21:16:40 +01:00
parent 2da5c51e42
commit bf7b0bf4bf
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloatersnapshot.cpp
View File

@@ -914,6 +914,7 @@ BOOL LLSnapshotLivePreview::onIdle(LLSnapshotLivePreview* previewp)
if (previewp->mCloseCalled) if (previewp->mCloseCalled)
{ {
previewp->mCloseCalled->setEnabled(TRUE); previewp->mCloseCalled->setEnabled(TRUE);
previewp->mCloseCalled->setVisible(TRUE);
} }
previewp->sSnapshotIndex++; previewp->sSnapshotIndex++;
Dout(dc::snapshot, "sSnapshotIndex is now " << previewp->sSnapshotIndex << "; mOutstandingCallbacks reset to 0."); Dout(dc::snapshot, "sSnapshotIndex is now " << previewp->sSnapshotIndex << "; mOutstandingCallbacks reset to 0.");
@@ -1464,6 +1465,7 @@ void LLSnapshotLivePreview::close(LLFloaterSnapshot* view)
} }
else else
{ {
view->setVisible(FALSE);
view->setEnabled(FALSE); view->setEnabled(FALSE);
} }
} }
@@ -1571,6 +1573,8 @@ void LLSnapshotLivePreview::doCloseAfterSave()
else else
{ {
mCloseCalled->setEnabled(TRUE); mCloseCalled->setEnabled(TRUE);
mCloseCalled->setVisible(TRUE);
gFloaterView->bringToFront(mCloseCalled);
mCloseCalled = NULL; mCloseCalled = NULL;
} }
} }
@@ -1690,8 +1694,8 @@ void LLFloaterSnapshot::Impl::freezeTime(bool on)
// can see and interact with fullscreen preview now // can see and interact with fullscreen preview now
if (previewp) if (previewp)
{ {
previewp->setVisible(TRUE);
previewp->setEnabled(TRUE); previewp->setEnabled(TRUE);
previewp->setVisible(TRUE);
} }
// Freeze all avatars. // Freeze all avatars.
@@ -2989,9 +2993,9 @@ void LLFloaterSnapshot::onOpen()
void LLFloaterSnapshot::onClose(bool app_quitting) void LLFloaterSnapshot::onClose(bool app_quitting)
{ {
gSnapshotFloaterView->setEnabled(FALSE);
// Set invisible so it doesn't eat tooltips. JC // Set invisible so it doesn't eat tooltips. JC
gSnapshotFloaterView->setVisible(FALSE); gSnapshotFloaterView->setVisible(FALSE);
gSnapshotFloaterView->setEnabled(FALSE);
gSavedSettings.setBOOL("SnapshotBtnState", FALSE); gSavedSettings.setBOOL("SnapshotBtnState", FALSE);
impl.freezeTime(false); impl.freezeTime(false);
destroy(); destroy();
@@ -3021,6 +3025,8 @@ void LLFloaterSnapshot::show(void*)
sInstance->open(); /* Flawfinder: ignore */ sInstance->open(); /* Flawfinder: ignore */
sInstance->focusFirstItem(FALSE); sInstance->focusFirstItem(FALSE);
sInstance->setEnabled(TRUE);
sInstance->setVisible(TRUE);
gSnapshotFloaterView->setEnabled(TRUE); gSnapshotFloaterView->setEnabled(TRUE);
gSnapshotFloaterView->setVisible(TRUE); gSnapshotFloaterView->setVisible(TRUE);
gSnapshotFloaterView->adjustToFitScreen(sInstance, FALSE); gSnapshotFloaterView->adjustToFitScreen(sInstance, FALSE);