EXT-7951 RESTORED IN VIEWER-DEVELOPMENT REPO (Mini-Location panel appearance design issues)

- Added callback on show\hide Mini Location Panel event. This callback sets proper initial minimized position depending on state (shown or hidded) Mini Location Panel. Also callback shifts vertically already minimized floaters so that they don't overlap Mini Location Panel

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/851/

--HG--
branch : product-engine
meow-7.2.2
Paul Guslisty 2010-08-24 12:39:11 +03:00
parent 76283d5cfb
commit f305ddc7f7
5 changed files with 50 additions and 5 deletions

View File

@ -2279,6 +2279,7 @@ void LLFloaterView::getMinimizePosition(S32 *left, S32 *bottom)
S32 floater_header_size = default_params.header_height;
static LLUICachedControl<S32> minimized_width ("UIMinimizedWidth", 0);
LLRect snap_rect_local = getLocalSnapRect();
snap_rect_local.mTop += mVMinimizePositionOffset;
for(S32 col = snap_rect_local.mLeft;
col < snap_rect_local.getWidth() - minimized_width;
col += minimized_width)
@ -2376,6 +2377,19 @@ BOOL LLFloaterView::allChildrenClosed()
return true;
}
void LLFloaterView::shiftFloaters(S32 x_offset, S32 y_offset)
{
for (child_list_const_iter_t it = getChildList()->begin(); it != getChildList()->end(); ++it)
{
LLFloater* floaterp = dynamic_cast<LLFloater*>(*it);
if (floaterp && floaterp->isMinimized())
{
floaterp->translate(x_offset, y_offset);
}
}
}
void LLFloaterView::refresh()
{
// Constrain children to be entirely on the screen

View File

@ -449,6 +449,7 @@ public:
// Given a child of gFloaterView, make sure this view can fit entirely onscreen.
void adjustToFitScreen(LLFloater* floater, BOOL allow_partial_outside);
void setMinimizePositionVerticalOffset(S32 offset) { mVMinimizePositionOffset = offset; }
void getMinimizePosition( S32 *left, S32 *bottom);
void restoreAll(); // un-minimize all floaters
typedef std::set<LLView*> skip_list_t;
@ -465,6 +466,7 @@ public:
// attempt to close all floaters
void closeAllChildren(bool app_quitting);
BOOL allChildrenClosed();
void shiftFloaters(S32 x_offset, S32 y_offset);
LLFloater* getFrontmost() const;
LLFloater* getBackmost() const;
@ -484,6 +486,7 @@ private:
BOOL mFocusCycleMode;
S32 mSnapOffsetBottom;
S32 mSnapOffsetRight;
S32 mVMinimizePositionOffset;
};
//

View File

@ -155,6 +155,8 @@ BOOL LLPanelTopInfoBar::postBuild()
mParcelMgrConnection = LLViewerParcelMgr::getInstance()->addAgentParcelChangedCallback(
boost::bind(&LLPanelTopInfoBar::onAgentParcelChange, this));
setVisibleCallback(boost::bind(&LLPanelTopInfoBar::onShow, this, _2));
return TRUE;
}
@ -168,6 +170,27 @@ void LLPanelTopInfoBar::onNavBarShowParcelPropertiesCtrlChanged()
setParcelInfoText(new_text);
}
// when panel is shown, all minimized floaters should be shifted to prevent overlapping of
// PanelTopInfoBar. See EXT-7951.
void LLPanelTopInfoBar::onShow(const LLSD& show)
{
// this height is used as a vertical offset for ALREADY MINIMIZED floaters
// when PanelTopInfoBar visibility changes
S32 height = getRect().getHeight();
// this vertical offset is used for a start minimize position of floaters that
// are NOT MIMIMIZED YET
S32 minimize_pos_offset = 0;
if (show.asBoolean())
{
height = minimize_pos_offset = -height;
}
gFloaterView->shiftFloaters(0, height);
gFloaterView->setMinimizePositionVerticalOffset(minimize_pos_offset);
}
void LLPanelTopInfoBar::draw()
{
updateParcelInfoText();

View File

@ -52,6 +52,11 @@ public:
*/
void handleLoginComplete();
/**
* Called when show/hide panel top info bar.
*/
void onShow(const LLSD& show);
private:
class LLParcelChangeObserver;

View File

@ -36,7 +36,7 @@
enabled="true"
follows="right|top"
height="18"
image_name="Parcel_VoiceNo_Light"
image_name="Parcel_VoiceNo_Dark"
name="voice_icon"
top="1"
visible="false"
@ -45,7 +45,7 @@
<icon
follows="right|top"
height="18"
image_name="Parcel_FlyNo_Light"
image_name="Parcel_FlyNo_Dark"
name="fly_icon"
top="1"
visible="false"
@ -54,7 +54,7 @@
<icon
follows="right|top"
height="18"
image_name="Parcel_PushNo_Light"
image_name="Parcel_PushNo_Dark"
name="push_icon"
top="1"
visible="false"
@ -63,7 +63,7 @@
<icon
follows="right|top"
height="18"
image_name="Parcel_BuildNo_Light"
image_name="Parcel_BuildNo_Dark"
name="build_icon"
top="1"
visible="false"
@ -72,7 +72,7 @@
<icon
follows="right|top"
height="18"
image_name="Parcel_ScriptsNo_Light"
image_name="Parcel_ScriptsNo_Dark"
name="scripts_icon"
top="1"
visible="false"