summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2010-06-10 21:33:07 +0300
committerAndrew Dyukov <adyukov@productengine.com>2010-06-10 21:33:07 +0300
commit968c7cf90685acbe8554a1843d5bb0c9fd9658e7 (patch)
treede8ac737336fa0cc683b34d0870e3b5da9d9cebe
parent9ed013048be5a17ea91200e7d9b3db32d7c61da2 (diff)
EXT-7511 FIXED Resolved newly reported problems in appearance UI
- Selection top cropping problem reproduces only for some systems and is caused by deeper problems in flatlist, so in this case it was fixed via workaround (increasing of item pad in flatlists) and the cause of it is in new ticket- EXT-7752 (Flatlist selection is a bit different on different systems). - '+' button now has a 3 px pad from right for consistensy with "wrench" from other items. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/549/ --HG-- branch : product-engine
-rw-r--r--indra/newview/llwearableitemslist.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/panel_cof_wearables.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml20
3 files changed, 19 insertions, 9 deletions
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 283a510ccd..abcc442170 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -306,7 +306,7 @@ BOOL LLPanelDummyClothingListItem::postBuild()
setIconCtrl(icon);
setTitleCtrl(getChild<LLTextBox>("item_name"));
- addWidgetToRightSide("btn_add");
+ addWidgetToRightSide("btn_add_panel");
setIconImage(LLInventoryIcon::getIcon(LLAssetType::AT_CLOTHING, LLInventoryType::IT_NONE, FALSE, mWearableType, FALSE));
updateItem();
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index d36c2a4e6f..f016c27b0a 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -28,7 +28,7 @@
allow_select="true"
follows="all"
height="10"
- item_pad="2"
+ item_pad="3"
layout="topleft"
left="0"
multi_select="true"
@@ -44,7 +44,7 @@
allow_select="true"
follows="all"
height="10"
- item_pad="2"
+ item_pad="3"
layout="topleft"
left="0"
multi_select="true"
@@ -60,7 +60,7 @@
allow_select="true"
follows="all"
height="10"
- item_pad="2"
+ item_pad="3"
layout="topleft"
left="0"
multi_select="true"
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index 20652df918..b1f4cbb079 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -49,16 +49,26 @@
top="4"
value="..."
width="359" />
- <button
- name="btn_add"
+ <panel
+ name="btn_add_panel"
layout="topleft"
follows="top|right"
- image_overlay="AddItem_Off"
top="0"
left="0"
height="23"
- width="23"
- tab_stop="false" />
+ width="26"
+ tab_stop="false">
+ <button
+ name="btn_add"
+ layout="topleft"
+ follows="top|right"
+ image_overlay="AddItem_Off"
+ top="0"
+ left="0"
+ height="23"
+ width="23"
+ tab_stop="false" />
+ </panel>
<icon
follows="left|right|top"
height="3"