From da00631c638acbf3d3b6ecbe5edb5abecf03252c Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 20 Jan 2010 18:21:54 +0200
Subject: [PATCH] Update for low bug EXT-4371 - Text from search history
drop-down list merge with landmarks on 'Favorites Bar'. Made border
customisable in combo box.
--HG--
branch : product-engine
---
indra/llui/llscrolllistctrl.cpp | 5 ++---
indra/llui/llscrolllistctrl.h | 3 +++
indra/newview/skins/default/xui/en/panel_navigation_bar.xml | 6 +++++-
indra/newview/skins/default/xui/en/widgets/scroll_list.xml | 4 +++-
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index a53a30b5012..4e84013db0c 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -142,6 +142,7 @@ LLScrollListCtrl::Params::Params()
contents(""),
scroll_bar_bg_visible("scroll_bar_bg_visible"),
scroll_bar_bg_color("scroll_bar_bg_color")
+ , border("border")
{
name = "scroll_list";
mouse_opaque = true;
@@ -231,10 +232,8 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p)
if (p.has_border)
{
LLRect border_rect = getLocalRect();
- LLViewBorder::Params params;
- params.name("dig border");
+ LLViewBorder::Params params = p.border;
params.rect(border_rect);
- params.bevel_style(LLViewBorder::BEVEL_IN);
mBorder = LLUICtrlFactory::create<LLViewBorder> (params);
addChild(mBorder);
}
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index 78bc60db6ed..907dc90bead 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -51,6 +51,7 @@
#include "lldate.h"
#include "llscrolllistitem.h"
#include "llscrolllistcolumn.h"
+#include "llviewborder.h"
class LLScrollListCell;
class LLTextBox;
@@ -109,6 +110,8 @@ class LLScrollListCtrl : public LLUICtrl, public LLEditMenuHandler,
scroll_bar_bg_color;
Optional<Contents> contents;
+
+ Optional<LLViewBorder::Params> border;
Params();
};
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 58cb5fed5dc..bfc97ed5da5 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -127,7 +127,11 @@
label="Search [SECOND_LIFE]"
name="search_combo_editor"/>
<combo_list
- draw_border="true" />
+ draw_border="true"
+ border.highlight_light_color="FocusColor"
+ border.highlight_dark_color="FocusColor"
+ border.shadow_light_color="FocusColor"
+ border.shadow_dark_color="FocusColor"/>
</search_combo_box>
</panel>
<favorites_bar
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
index 45207682165..63166f32b7f 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
@@ -15,4 +15,6 @@
background_visible="true"
heading_height="23"
draw_border="false"
- draw_heading="false" />
+ draw_heading="false"
+ border.name="dig border"
+ border.bevel_style="in" />
--
GitLab