diff options
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 8 | ||||
| -rw-r--r-- | indra/llui/lllayoutstack.h | 3 | ||||
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_main_inventory.xml | 18 |
4 files changed, 16 insertions, 14 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 77938edf27..8a011b4890 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -214,7 +214,8 @@ LLLayoutStack::Params::Params() drag_handle_first_indent("drag_handle_first_indent", 0), drag_handle_second_indent("drag_handle_second_indent", 0), drag_handle_thickness("drag_handle_thickness", 5), - drag_handle_shift("drag_handle_shift", 2) + drag_handle_shift("drag_handle_shift", 2), + drag_handle_color("drag_handle_color", LLUIColorTable::instance().getColor("ResizebarBody")) { addSynonym(border_size, "drag_handle_gap"); } @@ -234,7 +235,8 @@ LLLayoutStack::LLLayoutStack(const LLLayoutStack::Params& p) mDragHandleFirstIndent(p.drag_handle_first_indent), mDragHandleSecondIndent(p.drag_handle_second_indent), mDragHandleThickness(p.drag_handle_thickness), - mDragHandleShift(p.drag_handle_shift) + mDragHandleShift(p.drag_handle_shift), + mDragHandleColor(p.drag_handle_color()) { } @@ -561,7 +563,7 @@ void LLLayoutStack::createResizeBar(LLLayoutPanel* panelp) resize_bar_bg_panel_p.follows.flags = FOLLOWS_ALL; resize_bar_bg_panel_p.tab_stop = false; resize_bar_bg_panel_p.background_visible = true; - resize_bar_bg_panel_p.bg_alpha_color = LLUIColorTable::instance().getColor("ResizebarBody"); + resize_bar_bg_panel_p.bg_alpha_color = mDragHandleColor; resize_bar_bg_panel_p.has_border = true; resize_bar_bg_panel_p.border.border_thickness = 1; resize_bar_bg_panel_p.border.highlight_light_color = LLUIColorTable::instance().getColor("ResizebarBorderLight"); diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index f772dbc6b4..9a53a7f787 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -59,6 +59,8 @@ public: Optional<S32> drag_handle_thickness; Optional<S32> drag_handle_shift; + Optional<LLUIColor> drag_handle_color; + Params(); }; @@ -127,6 +129,7 @@ private: S32 mDragHandleSecondIndent; S32 mDragHandleThickness; S32 mDragHandleShift; + LLUIColor mDragHandleColor; }; // end class LLLayoutStack diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 18f80d5d55..dfcfc94cea 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -2194,7 +2194,6 @@ void LLPanelMainInventory::updateCombinationVisibility() { bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems(); getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(!is_gallery_empty); - getChild<LLView>("border")->setVisible(!is_gallery_empty); if(is_gallery_empty) { mCombinationGalleryPanel->handleModifiedFilter(); diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 6eb1cf0498..551e9835df 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -342,6 +342,13 @@ height="372" width="312" animate="false" + drag_handle_gap="13" + drag_handle_thickness="6" + drag_handle_first_indent="18" + drag_handle_second_indent="18" + drag_handle_color="AddPaymentPanel" + drag_handle_shift="5" + show_drag_handle="true" top="0" left="0" orientation="vertical"> @@ -359,22 +366,13 @@ filename="panel_inventory_gallery.xml" left="0" top_pad="0" - height="178" + height="186" width="312" name="comb_gallery_view_inv" background_visible="true" follows="all" layout="topleft"> </panel> - <view_border - bevel_style="none" - height="0" - follows="left|bottom|right" - layout="topleft" - left="6" - name="border" - top_pad="8" - width="300"/> </layout_panel> <layout_panel border="false" |