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

EXT-1501 Menu fonts now configurable in XUI, set size to SansSerifSmall

meow-7.2.2
James Cook 2009-11-06 13:51:16 -08:00
parent d158cc8619
commit 0b3bbf8cfc
3 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/llui/llmenugl.cpp
View File

@ -118,6 +118,7 @@ const F32 PIE_SHRINK_TIME = 0.2f; // time of transition between unbounded and bo
const F32 ACTIVATE_HIGHLIGHT_TIME = 0.3f;
static MenuRegistry::Register<LLMenuItemGL> register_menu_item("menu_item");
static MenuRegistry::Register<LLMenuItemSeparatorGL> register_separator("menu_item_separator");
static MenuRegistry::Register<LLMenuItemCallGL> register_menu_item_call("menu_item_call");
static MenuRegistry::Register<LLMenuItemCheckGL> register_menu_item_check("menu_item_check");
@ -132,6 +133,28 @@ static LLDefaultChildRegistry::Register<LLMenuGL> register_menu_default("menu");
///============================================================================
/// Class LLMenuItemGL
///============================================================================
LLMenuItemGL::Params::Params()
: shortcut("shortcut"),
jump_key("jump_key", KEY_NONE),
use_mac_ctrl("use_mac_ctrl", false),
rect("rect"),
left("left"),
top("top"),
right("right"),
bottom("bottom"),
width("width"),
height("height"),
bottom_delta("bottom_delta"),
left_delta("left_delta"),
enabled_color("enabled_color"),
disabled_color("disabled_color"),
highlight_bg_color("highlight_bg_color"),
highlight_fg_color("highlight_fg_color")
{
mouse_opaque = true;
}
// Default constructor
LLMenuItemGL::LLMenuItemGL(const LLMenuItemGL::Params& p)
: LLUICtrl(p),

21
indra/llui/llmenugl.h
View File

@ -79,26 +79,7 @@ public:
highlight_fg_color;
Params()
: shortcut("shortcut"),
jump_key("jump_key", KEY_NONE),
use_mac_ctrl("use_mac_ctrl", false),
rect("rect"),
left("left"),
top("top"),
right("right"),
bottom("bottom"),
width("width"),
height("height"),
bottom_delta("bottom_delta"),
left_delta("left_delta"),
enabled_color("enabled_color"),
disabled_color("disabled_color"),
highlight_bg_color("highlight_bg_color"),
highlight_fg_color("highlight_fg_color")
{
mouse_opaque = true;
}
Params();
};
protected:

6
indra/newview/skins/default/xui/en/widgets/menu_item.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- Use this for the top-level menu styling -->
<menu_item
font="SansSerifSmall"
>
</menu_item>