diff options
| -rw-r--r-- | indra/newview/llsidetray.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_side_tray.xml | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 15f5e9da7b..329d7d26ee 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -537,17 +537,15 @@ void LLSideTray::expandSideBar () void LLSideTray::highlightFocused() { + /* uncomment in case something change if(!mActiveTab) return; - /* uncomment in case something change BOOL dependent_has_focus = gFocusMgr.childHasKeyboardFocus(this); setBackgroundOpaque( dependent_has_focus ); mActiveTab->setBackgroundOpaque( dependent_has_focus ); */ - mActiveTab->setBackgroundOpaque( true ); - - } + BOOL LLSideTray::handleScrollWheel(S32 x, S32 y, S32 mask) { BOOL ret = LLPanel::handleScrollWheel(x,y,mask); @@ -565,6 +563,7 @@ BOOL LLSideTray::handleMouseDown (S32 x, S32 y, MASK mask) setFocus(true); return ret; } + void LLSideTray::reshape (S32 width, S32 height, BOOL called_from_parent) { @@ -675,7 +674,7 @@ void LLSideTray::resetPanelRect () static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray>()); S32 panel_width = sidetray_params.default_button_width; - panel_width += mCollapsed ? sidetray_params.default_button_margin : mMaxBarWidth; + panel_width += mCollapsed ? 0 : mMaxBarWidth; S32 panel_height = parent_rect.getHeight()-fake_top_offset; @@ -692,7 +691,7 @@ void LLSideTray::setPanelRect () const LLRect& parent_rect = gViewerWindow->getRootView()->getRect(); S32 panel_width = sidetray_params.default_button_width; - panel_width += mCollapsed ? sidetray_params.default_button_margin : mMaxBarWidth; + panel_width += mCollapsed ? 0 : mMaxBarWidth; S32 panel_height = parent_rect.getHeight()-fake_top_offset - nav_rect.getHeight(); S32 panel_top = parent_rect.mTop-fake_top_offset - nav_rect.getHeight(); diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 07afb3e912..395b574425 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Side tray cannot show background because it is always + partially on screen to hold tab buttons. --> <side_tray name="sidebar" background_visible="false" @@ -6,6 +8,10 @@ width="333" collapsed="true" > + <!-- Individual tabs must show background to have seemless + appearance up to tray panel header word like "Home". + Embedded panels are inset by a pixel and so their + backgrounds will not block the world fully. --> <sidetray_tab name="sidebar_home" help_topic="sidebar_home" @@ -13,7 +19,6 @@ description="Home." image="TabIcon_Open_Off" mouse_opaque="false" - background_opaque="false" background_visible="true" > <panel @@ -30,7 +35,6 @@ description="Find your friends, contacts and people nearby." image="TabIcon_People_Off" mouse_opaque="false" - background_opaque="false" background_visible="true" > <panel_container @@ -64,6 +68,7 @@ </panel_container> </sidetray_tab> + <sidetray_tab name="sidebar_places" help_topic="sidebar_places" @@ -107,7 +112,6 @@ description="Change your appearance and current look." image="TabIcon_Appearance_Off" mouse_opaque="false" - background_opaque="false" background_visible="true" > <panel @@ -119,5 +123,4 @@ /> </sidetray_tab> - </side_tray> |