From f9e900f5ac9002f5ef3b44b02ac300971288e89b Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Tue, 11 Oct 2011 17:36:23 -0700 Subject: * New floater positioning code. Better than what's checked in but not great. * Floater updates for positioning and to revert some earlier string changes. --- indra/newview/llappviewer.cpp | 7 +++++-- indra/newview/llfloatercamera.cpp | 2 +- indra/newview/llfloaterpreference.cpp | 1 - indra/newview/llfloatertoybox.cpp | 2 -- indra/newview/skins/default/xui/en/floater_about.xml | 1 + indra/newview/skins/default/xui/en/floater_about_land.xml | 3 ++- indra/newview/skins/default/xui/en/floater_activeim.xml | 2 -- indra/newview/skins/default/xui/en/floater_avatar.xml | 6 +++--- .../newview/skins/default/xui/en/floater_avatar_picker.xml | 1 + indra/newview/skins/default/xui/en/floater_camera.xml | 6 +++++- indra/newview/skins/default/xui/en/floater_chat_bar.xml | 5 ++++- indra/newview/skins/default/xui/en/floater_critical.xml | 2 +- .../newview/skins/default/xui/en/floater_destinations.xml | 7 ++++--- indra/newview/skins/default/xui/en/floater_gesture.xml | 4 +++- .../newview/skins/default/xui/en/floater_help_browser.xml | 3 +-- indra/newview/skins/default/xui/en/floater_im_session.xml | 2 -- indra/newview/skins/default/xui/en/floater_inventory.xml | 1 - .../default/xui/en/floater_inventory_item_properties.xml | 1 - .../newview/skins/default/xui/en/floater_land_holdings.xml | 1 + indra/newview/skins/default/xui/en/floater_map.xml | 5 ++--- .../newview/skins/default/xui/en/floater_media_browser.xml | 1 - .../skins/default/xui/en/floater_media_settings.xml | 1 - .../newview/skins/default/xui/en/floater_model_preview.xml | 2 +- indra/newview/skins/default/xui/en/floater_moveview.xml | 5 ++++- .../newview/skins/default/xui/en/floater_my_appearance.xml | 3 ++- .../newview/skins/default/xui/en/floater_my_inventory.xml | 3 ++- indra/newview/skins/default/xui/en/floater_my_profile.xml | 3 ++- .../skins/default/xui/en/floater_outfit_save_as.xml | 2 +- indra/newview/skins/default/xui/en/floater_people.xml | 1 + indra/newview/skins/default/xui/en/floater_places.xml | 1 + indra/newview/skins/default/xui/en/floater_postcard.xml | 1 - indra/newview/skins/default/xui/en/floater_preferences.xml | 5 +++-- .../skins/default/xui/en/floater_preview_animation.xml | 1 - .../skins/default/xui/en/floater_preview_gesture.xml | 3 +-- .../skins/default/xui/en/floater_preview_notecard.xml | 1 - .../newview/skins/default/xui/en/floater_preview_sound.xml | 1 - .../skins/default/xui/en/floater_preview_texture.xml | 1 - indra/newview/skins/default/xui/en/floater_script.xml | 2 -- .../skins/default/xui/en/floater_script_preview.xml | 1 - .../newview/skins/default/xui/en/floater_script_queue.xml | 1 - indra/newview/skins/default/xui/en/floater_search.xml | 14 +++++++------- indra/newview/skins/default/xui/en/floater_snapshot.xml | 3 ++- .../newview/skins/default/xui/en/floater_sound_devices.xml | 2 +- indra/newview/skins/default/xui/en/floater_sys_well.xml | 2 -- indra/newview/skins/default/xui/en/floater_telehub.xml | 1 - indra/newview/skins/default/xui/en/floater_tools.xml | 1 + indra/newview/skins/default/xui/en/floater_toybox.xml | 4 ++-- .../skins/default/xui/en/floater_voice_controls.xml | 3 ++- indra/newview/skins/default/xui/en/floater_web_content.xml | 1 - indra/newview/skins/default/xui/en/floater_world_map.xml | 4 ++-- .../newview/skins/default/xui/en/outfit_accordion_tab.xml | 2 +- indra/newview/skins/default/xui/en/panel_toast.xml | 1 + indra/newview/skins/default/xui/en/widgets/floater.xml | 4 +++- 53 files changed, 74 insertions(+), 69 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5077a0a596..2a9e411762 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4293,12 +4293,15 @@ void LLAppViewer::idle() return; } - gViewerWindow->updateUI(); + if (!quitRequested()) + { + gViewerWindow->updateUI(); + } /////////////////////////////////////// // Agent and camera movement // - LLCoordGL current_mouse = gViewerWindow->getCurrentMouse(); + LLCoordGL current_mouse = gViewerWindow->getCurrentMouse(); { // After agent and camera moved, figure out if we need to diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index b4658b1edb..aa78bc4f29 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -369,7 +369,7 @@ BOOL LLFloaterCamera::postBuild() // ensure that appearance mode is handled while building. See EXT-7796. handleAvatarEditingAppearance(sAppearanceEditing); - return TRUE; + return LLFloater::postBuild(); } void LLFloaterCamera::fillFlatlistFromPanel (LLFlatListView* list, LLPanel* panel) diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 8412d37810..5fdeb46daa 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1913,7 +1913,6 @@ BOOL LLFloaterPreferenceProxy::postBuild() getChild("socks5_password")->setValue(socks_cred->getAuthenticator()["creds"].asString()); } - center(); return TRUE; } diff --git a/indra/newview/llfloatertoybox.cpp b/indra/newview/llfloatertoybox.cpp index fa60022911..84881655f8 100644 --- a/indra/newview/llfloatertoybox.cpp +++ b/indra/newview/llfloatertoybox.cpp @@ -58,8 +58,6 @@ bool compare_localized_command_labels(LLCommand * cmd1, LLCommand * cmd2) BOOL LLFloaterToybox::postBuild() { - center(); - mBtnRestoreDefaults = getChild("btn_restore_defaults"); mToolBar = getChild("toybox_toolbar"); mToolBar->setStartDragCallback(boost::bind(LLToolBarView::startDragTool,_1,_2,_3)); diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 2580c06344..36af475824 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -1,5 +1,6 @@ diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml index 96fe0aa70c..670c528f08 100644 --- a/indra/newview/skins/default/xui/en/floater_activeim.xml +++ b/indra/newview/skins/default/xui/en/floater_activeim.xml @@ -4,8 +4,6 @@ name="floater_activeim" help_topic="floater_activeim" title="ACTIVE IM" - top="26" - left="0" height="22" width="320" follows="right|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml index 666aa2d164..6e5c4ada48 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar.xml @@ -12,12 +12,12 @@ single_instance="true" help_topic="avatar" save_rect="true" - title="Avatar Picker" - width="445"> + title="AVATAR PICKER" + width="635"> diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml index a11946d352..cbbbeb6094 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml @@ -1,5 +1,6 @@ diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml index 6977e29b78..924e4bc11e 100644 --- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml @@ -1,10 +1,13 @@