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

Added dynamic positioning to status bar parcel info, Fixed parcel info bleed thru on right-side controls, Reenabled status bar parcel info by default

master
Kadah 2011-03-20 18:54:49 -07:00
parent 04d3951cb5
commit 397acefd33
4 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@ -13216,7 +13216,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
<key>UseLegacyCursors</key>
<map>

26
indra/newview/llstatusbar.cpp
View File

@ -286,6 +286,7 @@ BOOL LLStatusBar::postBuild()
mInfoBtn = getChild<LLButton>("place_info_btn");
mInfoBtn->setClickedCallback(boost::bind(&LLStatusBar::onInfoButtonClicked, this));
mParcelInfoPanel = getChild<LLPanel>("parcel_info_panel");
mParcelInfoText = getChild<LLTextBox>("parcel_info_text");
mDamageText = getChild<LLTextBox>("damage_text");
@ -364,6 +365,11 @@ void LLStatusBar::refresh()
{
gMenuBarView->reshape(MENU_RIGHT, gMenuBarView->getRect().getHeight());
}
// also update the parcel info panel pos -KC
if ((MENU_RIGHT + MENU_PARCEL_SPACING) != mParcelInfoPanel->getRect().mLeft)
{
updateParcelPanel();
}
mSGBandwidth->setVisible(net_stats_visible);
mSGPacketLoss->setVisible(net_stats_visible);
@ -703,6 +709,18 @@ void LLStatusBar::update()
setParcelInfoText(new_text);
updateParcelIcons();
updateParcelPanel();
}
void LLStatusBar::updateParcelPanel()
{
const S32 MENU_RIGHT = gMenuBarView->getRightmostMenuEdge();
S32 left = MENU_RIGHT + MENU_PARCEL_SPACING;
LLRect rect = mParcelInfoPanel->getRect();
rect.mRight = left + rect.getWidth();
rect.mLeft = left;
mParcelInfoPanel->setRect(rect);
}
void LLStatusBar::updateParcelInfoText()
@ -916,3 +934,11 @@ void LLStatusBar::onParcelWLClicked()
{
KCWindlightInterface::instance().onClickWLStatusButton();
}
// hack -KC
void LLStatusBar::setBackgroundColor( const LLColor4& color )
{
LLPanel::setBackgroundColor(color);
getChild<LLPanel>("balance_bg")->setBackgroundColor(color);
getChild<LLPanel>("time_and_media_bg")->setBackgroundColor(color);
}

9
indra/newview/llstatusbar.h
View File

@ -45,6 +45,7 @@ class LLPanelVolumePulldown;
class LLPanelNearByMedia;
class LLIconCtrl;
class LLParcelChangeObserver;
class LLPanel;
class LLRegionDetails
@ -125,6 +126,8 @@ public:
LLRegionDetails mRegionDetails;
LLPanelNearByMedia* getNearbyMediaPanel() { return mPanelNearByMedia; }
void setBackgroundColor( const LLColor4& color );
private:
@ -199,6 +202,11 @@ private:
public:
/**
* Updates parcel panel pos (mParcelPanel).
*/
void updateParcelPanel();
/**
* Updates parcel icons (mParcelIcon[]).
*/
@ -256,6 +264,7 @@ private:
LLPanelVolumePulldown* mPanelVolumePulldown;
LLPanelNearByMedia* mPanelNearByMedia;
LLPanel* mParcelInfoPanel;
LLButton* mInfoBtn;
LLTextBox* mParcelInfoText;
LLTextBox* mDamageText;

19
indra/newview/skins/default/xui/en/panel_status_bar.xml
View File

@ -174,7 +174,10 @@
width="95"
top="0"
follows="right|top"
name="balance_bg">
name="balance_bg"
background_opaque="true"
background_visible="true"
bg_opaque_color="MouseGray">
<text
halign="center"
font="SansSerifSmall"
@ -208,6 +211,17 @@
top="2"
width="55" />
</panel>
<panel
height="18"
left_pad="0"
width="130"
top="0"
follows="right|top"
name="time_and_media_bg"
background_opaque="true"
background_visible="true"
bg_opaque_color="MouseGray">
<text
type="string"
font="SansSerifSmall"
@ -217,7 +231,7 @@
height="16"
top="5"
layout="topleft"
left_pad="0"
left="0"
name="TimeText"
tool_tip="Current time (Pacific)"
width="80">
@ -249,4 +263,5 @@
name="volume_btn"
tool_tip="Global Volume Control"
width="16" />
</panel>
</panel>