From 5d5d9ee7fa6a5bbe0b4573088c9e79e33e299999 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 25 Dec 2009 14:38:49 +0200
Subject: [PATCH] Fixed low sub task EXT-3451 - Code cleanup: Get Rid of Magic
constants in LLChicletPanel::Params::Params (move into widget xml).
--HG--
branch : product-engine
---
indra/newview/llchiclet.cpp | 11 +++--------
.../skins/default/xui/en/widgets/chiclet_panel.xml | 7 +++++++
2 files changed, 10 insertions(+), 8 deletions(-)
create mode 100644 indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 154a711431b..2719f10a3dc 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -1131,14 +1131,6 @@ LLChicletPanel::Params::Params()
, scrolling_offset("scrolling_offset")
, min_width("min_width")
{
- chiclet_padding = 3;
- scrolling_offset = 40;
-
- if (!min_width.isProvided())
- {
- // min_width = 4 chiclets + 3 paddings
- min_width = 180 + 3*chiclet_padding;
- }
};
LLChicletPanel::LLChicletPanel(const Params&p)
@@ -1151,6 +1143,9 @@ LLChicletPanel::LLChicletPanel(const Params&p)
, mMinWidth(p.min_width)
, mShowControls(true)
{
+ // min_width = 4 chiclets + 3 paddings
+ mMinWidth += 3 * mChicletPadding;
+
LLPanel::Params panel_params;
panel_params.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT);
mScrollArea = LLUICtrlFactory::create<LLPanel>(panel_params,this);
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
new file mode 100644
index 00000000000..d8cf1b98151
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<chiclet_panel
+ name="chiclet_panel"
+ chiclet_padding="3"
+ scrolling_offset="40"
+ min_width="180"
+ />
\ No newline at end of file
--
GitLab