From f4703f55eb5728f50f094bc54e99065f0481a067 Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Thu, 18 Feb 2010 11:36:19 +0200 Subject: Fixed critical bug EXT - 4878 (Tab labels are no longer obeying halign attribute) --- indra/llui/lltabcontainer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index e810b6fe8f..9a715cca0b 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -214,7 +214,8 @@ LLTabContainer::Params::Params() last_tab("last_tab"), use_custom_icon_ctrl("use_custom_icon_ctrl", false), tab_icon_ctrl_pad("tab_icon_ctrl_pad", 0), - use_ellipses("use_ellipses") + use_ellipses("use_ellipses"), + font_halign("font_halign") { name(std::string("tab_container")); mouse_opaque = false; -- cgit v1.2.3 From 1d89f02243d2bcd39380181efa4ca04cc8bab16f Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Sat, 20 Feb 2010 13:07:03 -0500 Subject: EXT-4878 - fixing the fix - incorrect name used for attribute. --- indra/llui/lltabcontainer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 9a715cca0b..07e4cc22e0 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -215,7 +215,7 @@ LLTabContainer::Params::Params() use_custom_icon_ctrl("use_custom_icon_ctrl", false), tab_icon_ctrl_pad("tab_icon_ctrl_pad", 0), use_ellipses("use_ellipses"), - font_halign("font_halign") + font_halign("halign") { name(std::string("tab_container")); mouse_opaque = false; -- cgit v1.2.3 From f08ab41c3e5d7824cb34378ba5a400795e7e888c Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Sat, 20 Feb 2010 13:11:25 -0500 Subject: Importing patch for EXT-5571 for Beta 3 release. Fix by Callum originally. --- indra/newview/llbottomtray.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 459a61dec3..3f60cec6da 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -915,7 +915,7 @@ void LLBottomTray::processShrinkButtons(S32* required_width, S32* buttons_freed_ else { // - mSpeakBtn->setLabelVisible(false); + //mSpeakBtn->setLabelVisible(false); // HACK: this button doesn't change size so label should not be turned off S32 panel_width = mSpeakPanel->getRect().getWidth(); S32 possible_shrink_width = panel_width - panel_min_width; @@ -1006,7 +1006,7 @@ void LLBottomTray::processExtendButtons(S32* available_width) S32 panel_max_width = mObjectDefaultWidthMap[RS_BUTTON_SPEAK]; S32 panel_width = mSpeakPanel->getRect().getWidth(); S32 possible_extend_width = panel_max_width - panel_width; - if (possible_extend_width > 0 && possible_extend_width <= *available_width) + if (possible_extend_width >= 0 && possible_extend_width <= *available_width) // HACK: this button doesn't change size so possible_extend_width will be 0 { mSpeakBtn->setLabelVisible(true); mSpeakPanel->reshape(panel_max_width, mSpeakPanel->getRect().getHeight()); -- cgit v1.2.3 From 4cf6ad1bd68ac2f944b93c1b5fed6d11ac69f56a Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Sat, 20 Feb 2010 14:00:06 -0500 Subject: EXT-5593 - Fix by Erica to fix problems with button size for Beta 3. Verified by Q. --- indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 86eaa79587..cc60b97f92 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -64,7 +64,7 @@ Date: Sat, 20 Feb 2010 14:41:18 -0500 Subject: EXT-5560 - filter clear button was calling doDelete which had many more gyrations than onCommit, and only onCommit was needed --- indra/llui/llsearcheditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp index 491eeeab54..8075575bab 100644 --- a/indra/llui/llsearcheditor.cpp +++ b/indra/llui/llsearcheditor.cpp @@ -156,7 +156,7 @@ void LLSearchEditor::setFocus( BOOL b ) void LLSearchEditor::onClearButtonClick(const LLSD& data) { setText(LLStringUtil::null); - mSearchEditor->doDelete(); // force keystroke callback + mSearchEditor->onCommit(); // force keystroke callback } void LLSearchEditor::handleKeystroke() -- cgit v1.2.3