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

merge

master
James Cook 2009-11-12 13:45:22 -08:00
parent 3e73b75fa2 ab3cb6d937
commit fc6b3d4caa
8 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/lluictrl.cpp
View File

@ -38,10 +38,6 @@
#include "llpanel.h"
#include "lluictrlfactory.h"
// This breaks the ability to construct dummy LLUICtrls for calls like
// getChild<LLUICtrl>("not-there")
//static LLWidgetNameRegistry::StaticRegistrar r(&typeid(LLUICtrl::Params), "ui_ctrl");
// This doesn't appear to read/apply ui_ctrl.xml
static LLDefaultChildRegistry::Register<LLUICtrl> r("ui_ctrl");
LLUICtrl::Params::Params()

2
indra/llui/lluictrlfactory.cpp
View File

@ -433,8 +433,8 @@ void LLUICtrlFactory::registerWidget(const std::type_info* widget_type, const st
LLWidgetNameRegistry ::instance().defaultRegistrar().add(param_block_type, tag);
// associate widget type with factory function
LLDefaultWidgetRegistry::instance().defaultRegistrar().add(widget_type, creator_func);
LLWidgetTypeRegistry::instance().defaultRegistrar().add(tag, widget_type);
//FIXME: comment this in when working on schema generation
//LLWidgetTypeRegistry::instance().defaultRegistrar().add(tag, widget_type);
//LLDefaultParamBlockRegistry::instance().defaultRegistrar().add(widget_type, &getEmptyParamBlock<T>);
}

4
indra/newview/llfolderviewitem.cpp
View File

@ -388,7 +388,9 @@ BOOL LLFolderViewItem::addToFolder(LLFolderViewFolder* folder, LLFolderView* roo
// makes sure that this view and it's children are the right size.
S32 LLFolderViewItem::arrange( S32* width, S32* height, S32 filter_generation)
{
mIndentation = mParentFolder ? mParentFolder->getIndentation() + LEFT_INDENTATION : 0;
mIndentation = getParentFolder() && getParentFolder()->getParentFolder()
? mParentFolder->getIndentation() + LEFT_INDENTATION
: 0;
if (mLabelWidthDirty)
{
mLabelWidth = ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD + getLabelFontForStyle(mLabelStyle)->getWidth(mSearchableLabel);

2
indra/newview/llfolderviewitem.h
View File

@ -110,7 +110,7 @@ public:
// layout constants
static const S32 LEFT_PAD = 5;
static const S32 LEFT_INDENTATION = 13;
static const S32 LEFT_INDENTATION = 8;
static const S32 ICON_PAD = 2;
static const S32 ICON_WIDTH = 16;
static const S32 TEXT_PAD = 1;

3
indra/newview/llinspectgroup.cpp
View File

@ -216,7 +216,8 @@ void LLInspectGroup::requestUpdate()
getChild<LLUICtrl>("group_details")->setValue("");
getChild<LLUICtrl>("group_cost")->setValue("");
// Must have a visible button so the inspector can take focus
getChild<LLUICtrl>("leave_btn")->setVisible(true);
getChild<LLUICtrl>("view_profile_btn")->setVisible(true);
getChild<LLUICtrl>("leave_btn")->setVisible(false);
getChild<LLUICtrl>("join_btn")->setVisible(false);
// Make a new request for properties

2
indra/newview/skins/default/textures/textures.xml
View File

@ -532,7 +532,7 @@
<texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="false" />
<texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="false" />
<texture name="Tooltip" file_name="widgets/Tooltip.png" preload="true" scale.left="2" scale.top="1" scale.right="99" scale.bottom="14" />
<texture name="Tooltip" file_name="widgets/Tooltip.png" preload="true" scale.left="2" scale.top="16" scale.right="100" scale.bottom="3" />
<texture name="TrashItem_Disabled" file_name="icons/TrashItem_Disabled.png" preload="false" />
<texture name="TrashItem_Off" file_name="icons/TrashItem_Off.png" preload="false" />

2
indra/newview/skins/default/xui/en/inspect_group.xml
View File

@ -31,7 +31,7 @@
use_ellipses="true"
width="240"
word_wrap="false">
Grumpity's Grumpy Group of Moose
Grumpity&apos;s Grumpy Group of Moose
</text>
<text
follows="all"

14
indra/newview/skins/default/xui/en/main_view.xml
View File

@ -51,6 +51,13 @@
name="main_view"
user_resize="true"
width="500">
<view bottom="500"
follows="all"
height="500"
left="0"
mouse_opaque="false"
name="world_view_rect"
width="500"/>
<layout_stack border_size="0"
bottom="500"
follows="all"
@ -66,13 +73,6 @@
mouse_opaque="false"
name="hud container"
width="500">
<view bottom="500"
follows="all"
height="500"
left="0"
mouse_opaque="false"
name="world_view_rect"
width="500"/>
<panel follows="right|top|bottom"
height="500"
mouse_opaque="false"