summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-09-23 18:45:51 +0000
committerJames Cook <james@lindenlab.com>2009-09-23 18:45:51 +0000
commit01c7b50edbca7d397dfe5e4ba3d8b5a2e4b6780d (patch)
tree059ada71f18bda34ac74c97df9e067ed119c2bf0 /indra/newview/skins/default
parentfed64f4bd5ec21e0716651817336fb140a11a3ea (diff)
EXT-646 Pinned menus display incorrectly. Menu needs to follow bottom-left corner to avoid being pulled up when floater resizes to accommodate. Fixed floater height computation, removed magic numbers. Added XML configuration file for menu_item_tear_off so we can set colors to make the lines visible when highlighted. Reviewed with Richard.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/menu_login.xml3
-rw-r--r--indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml7
2 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index b08b87a19c..6db6448677 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -64,7 +64,8 @@
create_jump_keys="true"
label="Debug"
layout="topleft"
- name="Debug">
+ name="Debug"
+ tear_off="true">
<!-- Need a copy of the edit menu here so keyboard shortcuts like
control-C work to copy text at login screen and About dialog (for QA)
-->
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
new file mode 100644
index 0000000000..185ed6ee3e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Use "disabled color" to make it look like menu separators -->
+<menu_item_tear_off enabled_color="MenuItemDisabledColor"
+ disabled_color="MenuItemDisabledColor"
+ highlight_bg_color="MenuItemHighlightBgColor"
+ highlight_fg_color="MenuItemHighlightFgColor">
+</menu_item_tear_off>