From 9273459251a6c59f8fabc50d9eef0b78e092e6fd Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Mon, 10 Oct 2011 17:09:46 +0300 Subject: EXP-1285 FIXED Chiclets moved to the upper right of the viewer window. - Floaters dock to chiclets at the bottom. - Floaters docking region limited to non-toolbar view. - Chiclet bar is positioned between the right toolbar and the minimized floaters stacked at the top left corner by default. --- indra/llui/lldockcontrol.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llui') diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index 6e39fcd714..6397bbd0de 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -92,7 +92,7 @@ void LLDockControl::setDock(LLView* dockWidget) void LLDockControl::getAllowedRect(LLRect& rect) { - rect = mDockableFloater->getRootView()->getRect(); + rect = mDockableFloater->getRootView()->getChild("non_toolbar_panel")->getRect(); } void LLDockControl::repositionDockable() -- cgit v1.3 From c224e589d072e733ec5b95f95b3770d5bf0584f0 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Fri, 14 Oct 2011 14:23:06 -0700 Subject: EXP-1272 FIX Move "How To" to a separate web floater added missing file and updated size of floater --- indra/llui/llfloater.cpp | 4 +++- indra/newview/llviewermenu.cpp | 1 + indra/newview/skins/default/xui/en/floater_how_to.xml | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/xui/en/floater_how_to.xml (limited to 'indra/llui') diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index fa533e8153..d1d840729d 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -3048,7 +3048,9 @@ bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::str return FALSE; } - parser.readXUI(referenced_xml, params, LLUICtrlFactory::getInstance()->getCurFileName()); + Params referenced_params; + parser.readXUI(referenced_xml, referenced_params, LLUICtrlFactory::getInstance()->getCurFileName()); + params.fillFrom(referenced_params); // add children using dimensions from referenced xml for consistent layout setShape(params.rect); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index cfbe32a871..10563971b3 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6897,6 +6897,7 @@ class LLToggleHowTo : public view_listener_t p.show_chrome = false; p.target = "__help_how_to"; p.show_page_title = false; + p.preferred_media_size = LLRect(0, 460, 335, 0); LLFloaterReg::toggleInstanceOrBringToFront("how_to", p); return true; diff --git a/indra/newview/skins/default/xui/en/floater_how_to.xml b/indra/newview/skins/default/xui/en/floater_how_to.xml new file mode 100644 index 0000000000..0369ecbeff --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_how_to.xml @@ -0,0 +1,17 @@ + + \ No newline at end of file -- cgit v1.3 From 93b6be6288036681c583e23be3b43ed23732352c Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Fri, 14 Oct 2011 14:46:21 -0700 Subject: New icon love for FUI --- indra/llui/llbutton.cpp | 2 +- .../skins/default/textures/toolbar_icons/mini_map.png | Bin 1645 -> 1766 bytes .../default/textures/toolbar_icons/nearbyvoice.png | Bin 3160 -> 1460 bytes .../default/textures/toolbar_icons/preferences.png | Bin 1427 -> 1587 bytes .../skins/default/textures/toolbar_icons/view.png | Bin 1618 -> 1487 bytes 5 files changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llui') diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 3572d18860..64fd14ecc9 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -817,7 +817,7 @@ void LLButton::draw() LLColor4 overlay_color = mImageOverlayColor.get(); if (!enabled) { - overlay_color.mV[VALPHA] = 0.5f; + overlay_color.mV[VALPHA] = 0.3f; } else if (!getToggleState()) { diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_map.png b/indra/newview/skins/default/textures/toolbar_icons/mini_map.png index b66af223bb..ab0a654056 100644 Binary files a/indra/newview/skins/default/textures/toolbar_icons/mini_map.png and b/indra/newview/skins/default/textures/toolbar_icons/mini_map.png differ diff --git a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png index 46e299cb94..22d88af352 100644 Binary files a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png and b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png differ diff --git a/indra/newview/skins/default/textures/toolbar_icons/preferences.png b/indra/newview/skins/default/textures/toolbar_icons/preferences.png index df80d926b5..4ccd7b8ae1 100644 Binary files a/indra/newview/skins/default/textures/toolbar_icons/preferences.png and b/indra/newview/skins/default/textures/toolbar_icons/preferences.png differ diff --git a/indra/newview/skins/default/textures/toolbar_icons/view.png b/indra/newview/skins/default/textures/toolbar_icons/view.png index 5425af87e0..ddf0df7c26 100644 Binary files a/indra/newview/skins/default/textures/toolbar_icons/view.png and b/indra/newview/skins/default/textures/toolbar_icons/view.png differ -- cgit v1.3