From fd846da06cbd1a62023de8e9c3ec61d40e8cd226 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Thu, 8 Oct 2009 01:48:50 +0000 Subject: only add LLScrollContainers to text widgets when requested, saving on LLTextBox construction time combined clip and scroll attributes of text editors and text boxes...if you want to clip text, you need to introduce a scrollbar moved clear to LLTextEditor so that text boxes won't empty out when calling LLPanel::clearCtrls() EXT-1354 - added optional wrapping to LLTooltips...inspector tooltips don't wrap, everything else does added LLFastTimer::reset call on application init to prime timers for pre-login timing fixed tooltips positioning incorrectly due to mis-sized tooltipview eliminated hide_scrollbar param for text editors reviewed by Leyla --- indra/newview/llappviewer.cpp | 3 ++- indra/newview/llchatmsgbox.cpp | 2 +- indra/newview/lltoolpie.cpp | 6 ++++-- indra/newview/llviewerwindow.cpp | 1 + indra/newview/skins/default/xui/en/floater_incoming_call.xml | 1 - indra/newview/skins/default/xui/en/floater_settings_debug.xml | 1 - indra/newview/skins/default/xui/en/floater_test_widgets.xml | 1 + indra/newview/skins/default/xui/en/panel_audio_device.xml | 1 - indra/newview/skins/default/xui/en/panel_avatar_tag.xml | 1 - indra/newview/skins/default/xui/en/panel_edit_pick.xml | 1 - indra/newview/skins/default/xui/en/panel_group_general.xml | 1 - indra/newview/skins/default/xui/en/panel_group_notices.xml | 2 -- indra/newview/skins/default/xui/en/panel_group_roles.xml | 2 -- indra/newview/skins/default/xui/en/panel_notes.xml | 1 - indra/newview/skins/default/xui/en/panel_teleport_history_item.xml | 2 +- indra/newview/skins/default/xui/en/widgets/expandable_text.xml | 4 ++-- indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml | 6 +++--- indra/newview/skins/default/xui/en/widgets/text.xml | 7 +++---- indra/newview/skins/default/xui/en/widgets/textbase.xml | 6 +++--- 19 files changed, 21 insertions(+), 28 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 41cbc21fe9..d47b994322 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -594,7 +594,8 @@ bool LLAppViewer::init() // into the log files during normal startup until AFTER // we run the "program crashed last time" error handler below. // - + LLFastTimer::reset(); + // Need to do this initialization before we do anything else, since anything // that touches files should really go through the lldir API gDirUtilp->initAppDirs("SecondLife"); diff --git a/indra/newview/llchatmsgbox.cpp b/indra/newview/llchatmsgbox.cpp index 6eaafc9059..12626e3b43 100644 --- a/indra/newview/llchatmsgbox.cpp +++ b/indra/newview/llchatmsgbox.cpp @@ -59,7 +59,7 @@ public: /*virtual*/ S32 getWidth(S32 first_char, S32 num_chars) const { - return mEditor->getDocumentPanel()->getRect().getWidth(); + return mEditor->getDocumentView()->getRect().getWidth(); } /*virtual*/ F32 draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect) diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index beb16c267e..b015f668e4 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -703,7 +703,8 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask) .image(LLUI::getUIImage("Info")) .click_callback(boost::bind(showAvatarInspector, hover_object->getID())) .visible_time_near(6.f) - .visible_time_far(3.f)); + .visible_time_far(3.f) + .wrap(false)); } } else @@ -746,7 +747,8 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask) .image(LLUI::getUIImage("Info")) .click_callback(boost::bind(showObjectInspector, hover_object->getID())) .visible_time_near(6.f) - .visible_time_far(3.f)); + .visible_time_far(3.f) + .wrap(false)); } } } diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 24d00cba16..22141011a2 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1465,6 +1465,7 @@ void LLViewerWindow::initBase() LLToolTipView::Params hvp; hvp.name("tooltip view"); hvp.rect(full_window); + hvp.follows.flags(FOLLOWS_ALL); gToolTipView = LLUICtrlFactory::create(hvp); getRootView()->addChild(gToolTipView); diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml index bdce8fa4fc..95e4247a05 100644 --- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml @@ -34,7 +34,6 @@ font="SansSerif" height="64" border_visible="false" - hide_scrollbar="true" layout="topleft" left="77" max_length="2147483647" diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml index e2f4a73ec8..b7779687ec 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml @@ -23,7 +23,6 @@ diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 5dd03656c6..b9a01d80f9 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -120,7 +120,6 @@ follows="left|top|right" height="100" width="220" - hide_scrollbar="true" layout="topleft" left="10" top_pad="2" diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 03e2d35b9f..e49914d5e6 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -45,7 +45,6 @@ Hover your mouse over the options for more help. follows="left|top" left="5" height="75" - hide_scrollbar="true" layout="topleft" max_length="511" name="charter" diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index ffc2f279bc..82a3c98dd9 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -187,7 +187,6 @@ the General tab. + v_pad="3" + h_pad="4" > diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml index c352abca3b..e5dc022633 100644 --- a/indra/newview/skins/default/xui/en/widgets/textbase.xml +++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml @@ -1,4 +1,4 @@ - + -- cgit v1.2.3