summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorAndrew Polunin <apolunin@productengine.com>2010-07-06 17:30:20 +0300
committerAndrew Polunin <apolunin@productengine.com>2010-07-06 17:30:20 +0300
commit3e7af3244f20f64b2d1c5ebc8d9f1fa616bee104 (patch)
tree23efb172d1afd6a67a9d2c70fc0a6ba639bd4b51 /indra/newview/skins/default/xui
parent38d54c07508ece7c08a0cc14e9da4706b3f7ef16 (diff)
EXT-7536 FIXED (Favorites bar and Navigation bar looks similar to the mock-up)
- Added constant FAVBAR_TOP_PADDING in the LLNavigationBar which defines the distance between navigation panel and favorites panel in pixels. - Added new image NavBar_BG_NoFav_Bevel which is used to show navigation panel with favorites bar hidden. It is required to show navigation panel with bevel at the bottom. - Added new image NavBar_BG_NoNav_Bevel which is used to show favorites panel with navigation panel hidden. It is required to show favorites panel with bevel at the top. - Removed image NavBar_BG_NoFav. It is not used anymore. - Modified the methods showNavigationPanel and showFavoritesPanel to take into account that distance. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/664/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_navigation_bar.xml17
1 files changed, 14 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 00b1fdd843..2c9d7e4b6a 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -22,14 +22,25 @@
width="600"/>
<icon
follows="all"
- image_name="NavBar_BG_NoFav"
+ image_name="NavBar_BG_NoFav_Bevel"
mouse_opaque="false"
- name="bg_icon_no_fav"
+ name="bg_icon_no_fav_bevel"
scale_image="true"
visible="false"
left="0"
top="0"
- height="50"
+ height="60"
+ width="600"/>
+ <icon
+ follows="all"
+ image_name="NavBar_BG_NoNav_Bevel"
+ mouse_opaque="false"
+ name="bg_icon_no_nav_bevel"
+ scale_image="true"
+ visible="false"
+ left="0"
+ top="0"
+ height="60"
width="600"/>
<panel
background_visible="false"