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

Update for major task EXT-6564 - Fix wearable editing panels. 

Added temporary "edit" button to outfit list to allow QA test new wearable edit panels.
Was not reviewed.

--HG--
branch : product-engine
meow-7.2.2
Dmitry Zaporozhan 2010-04-19 13:00:12 +03:00
parent d69084d5d8
commit b42efcfee3
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llpaneloutfitedit.cpp
View File

@ -457,20 +457,18 @@ void LLPanelOutfitEdit::onInventorySelectionChange(const std::deque<LLFolderView
void LLPanelOutfitEdit::onOutfitItemSelectionChange(void)
{
S32 left_offset = -4;
S32 top_offset = -10;
LLScrollListItem* item = mLookContents->getLastSelectedItem();
if (!item)
return;
LLRect rect = item->getRect();
LLRect btn_rect(
left_offset + rect.mRight - 50,
top_offset + rect.mTop,
left_offset + rect.mRight - 30,
top_offset + rect.mBottom);
LLRect item_rect;
mLookContents->localRectToOtherView(item->getRect(), &item_rect, getChild<LLUICtrl>("outfit_wearables_panel"));
// TODO button(and item list) should be removed (when new widget is ready)
LLRect btn_rect = mEditWearableBtn->getRect();
btn_rect.set(item_rect.mRight - btn_rect.getWidth(), item_rect.mTop, item_rect.mRight, item_rect.mBottom);
mEditWearableBtn->setRect(btn_rect);
mEditWearableBtn->setShape(btn_rect);
mEditWearableBtn->setEnabled(TRUE);
if (!mEditWearableBtn->getVisible())

10
indra/newview/skins/default/xui/en/panel_outfit_edit.xml
View File

@ -154,6 +154,16 @@
sort_column="look_item_sort"
name="look_item_sort" />
</scroll_list>
<!-- TODO remove this button. Added it temporary for QA to be able to test new edit wearable panel (see EXT-6564)-->
<button
follows="left|top|right"
height="20"
label="edit"
left="0"
top="0"
layout="topleft"
name="edit_wearable_btn"
width="40" />
<panel
background_visible="true"