From a2600644ab39cc634e2da13bb06c39c757887a72 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 25 May 2010 16:51:06 -0700 Subject: DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the viewer --- indra/newview/llfloateruipreview.cpp | 14 ++++++-- indra/newview/skins/default/textures/textures.xml | 5 +++ .../default/textures/widgets/bevel_background.png | Bin 0 -> 365 bytes .../skins/default/textures/widgets/buy_off.png | Bin 0 -> 54754 bytes .../skins/default/textures/widgets/buy_over.png | Bin 0 -> 54772 bytes .../skins/default/textures/widgets/buy_press.png | Bin 0 -> 54861 bytes .../skins/default/xui/en/panel_status_bar.xml | 40 +++++++++++---------- 7 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 indra/newview/skins/default/textures/widgets/bevel_background.png create mode 100644 indra/newview/skins/default/textures/widgets/buy_off.png create mode 100644 indra/newview/skins/default/textures/widgets/buy_over.png create mode 100644 indra/newview/skins/default/textures/widgets/buy_press.png (limited to 'indra') diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp index f61c86db14..1b6ef0e97a 100644 --- a/indra/newview/llfloateruipreview.cpp +++ b/indra/newview/llfloateruipreview.cpp @@ -266,11 +266,12 @@ private: class LLPreviewedFloater : public LLFloater { public: - LLPreviewedFloater(LLFloaterUIPreview* floater) - : LLFloater(LLSD()), + LLPreviewedFloater(LLFloaterUIPreview* floater, const Params& params) + : LLFloater(LLSD(), params), mFloaterUIPreview(floater) { } + virtual void draw(); BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); BOOL handleToolTip(S32 x, S32 y, MASK mask); @@ -428,6 +429,7 @@ BOOL LLFloaterUIPreview::postBuild() // Double-click opens the floater, for convenience mFileList->setDoubleClickCallback(boost::bind(&LLFloaterUIPreview::onClickDisplayFloater, this, PRIMARY_FLOATER)); + setDefaultBtn("display_floater"); // get pointers to buttons and link to callbacks mLanguageSelection = main_panel_tmp->getChild("language_select_combo"); mLanguageSelection->setCommitCallback(boost::bind(&LLFloaterUIPreview::onLanguageComboSelect, this, mLanguageSelection)); @@ -824,7 +826,11 @@ void LLFloaterUIPreview::displayFloater(BOOL click, S32 ID, bool save) return; // ignore click (this can only happen with empty list; otherwise an item is always selected) } - *floaterp = new LLPreviewedFloater(this); + LLFloater::Params p(LLFloater::getDefaultParams()); + p.min_height=p.header_height; + p.min_width=10; + + *floaterp = new LLPreviewedFloater(this, p); if(!strncmp(path.c_str(),"floater_",8) || !strncmp(path.c_str(), "inspect_", 8)) // if it's a floater @@ -874,6 +880,8 @@ void LLFloaterUIPreview::displayFloater(BOOL click, S32 ID, bool save) } else // if it is a panel... { + (*floaterp)->setCanResize(true); + const LLFloater::Params& floater_params = LLFloater::getDefaultParams(); S32 floater_header_size = floater_params.header_height; diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 0788a0ca9e..2c1cb59387 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -649,4 +649,9 @@ with the same filename but different name + + + + + diff --git a/indra/newview/skins/default/textures/widgets/bevel_background.png b/indra/newview/skins/default/textures/widgets/bevel_background.png new file mode 100644 index 0000000000..fb5067503d Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/bevel_background.png differ diff --git a/indra/newview/skins/default/textures/widgets/buy_off.png b/indra/newview/skins/default/textures/widgets/buy_off.png new file mode 100644 index 0000000000..961ad071d4 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/buy_off.png differ diff --git a/indra/newview/skins/default/textures/widgets/buy_over.png b/indra/newview/skins/default/textures/widgets/buy_over.png new file mode 100644 index 0000000000..0be19f8a31 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/buy_over.png differ diff --git a/indra/newview/skins/default/textures/widgets/buy_press.png b/indra/newview/skins/default/textures/widgets/buy_press.png new file mode 100644 index 0000000000..d6f587464d Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/buy_press.png differ diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 690d2971ee..e0c9c49a23 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -43,38 +43,40 @@