Skip to content
Snippets Groups Projects
Commit f260d52c authored by Dmitry Zaporozhan's avatar Dmitry Zaporozhan
Browse files

Fixed EXT-6930(normal) - Edit Outfit: "Add wearables" panel layout is broken.

NOTE: this is a temporary fix, see EXT-6564(Fix wearable editing panels) for more info.
Fix info:
- Moved edit wearable button to place where it does not break widget paddings.
- Updated code that calculates button position.
- Sending button to front to ensure it is clickable and visible.

Not reviewed.

--HG--
branch : product-engine
parent 1ce1e7f9
Branches
No related tags found
No related merge requests found
...@@ -468,13 +468,14 @@ void LLPanelOutfitEdit::onOutfitItemSelectionChange(void) ...@@ -468,13 +468,14 @@ void LLPanelOutfitEdit::onOutfitItemSelectionChange(void)
return; return;
LLRect item_rect; LLRect item_rect;
mLookContents->localRectToOtherView(item->getRect(), &item_rect, getChild<LLUICtrl>("outfit_wearables_panel")); mLookContents->localRectToOtherView(item->getRect(), &item_rect, this);
// TODO button(and item list) should be removed (when new widget is ready) // TODO button(and item list) should be removed (when new widget is ready)
LLRect btn_rect = mEditWearableBtn->getRect(); LLRect btn_rect = mEditWearableBtn->getRect();
btn_rect.set(item_rect.mRight - btn_rect.getWidth(), item_rect.mTop, item_rect.mRight, item_rect.mBottom); btn_rect.set(item_rect.mRight - btn_rect.getWidth(), item_rect.mTop, item_rect.mRight, item_rect.mBottom);
mEditWearableBtn->setShape(btn_rect); mEditWearableBtn->setShape(btn_rect);
sendChildToFront(mEditWearableBtn);
mEditWearableBtn->setEnabled(TRUE); mEditWearableBtn->setEnabled(TRUE);
if (!mEditWearableBtn->getVisible()) if (!mEditWearableBtn->getVisible())
......
...@@ -30,6 +30,20 @@ ...@@ -30,6 +30,20 @@
<string name="Filter.Clothes/Body" value="Clothes/Body"/> <string name="Filter.Clothes/Body" value="Clothes/Body"/>
<string name="Filter.Objects" value="Objects"/> <string name="Filter.Objects" value="Objects"/>
<!--
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" />
<button <button
follows="top|left" follows="top|left"
height="23" height="23"
...@@ -158,16 +172,6 @@ ...@@ -158,16 +172,6 @@
sort_column="look_item_sort" sort_column="look_item_sort"
name="look_item_sort" /> name="look_item_sort" />
</scroll_list> </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 <panel
background_visible="true" background_visible="true"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment