From 5da990e8fbce8f96a5a2cf8e72eb21ef1b836b09 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Fri, 13 Jan 2012 00:52:13 -0500 Subject: [PATCH 1/4] Eep, did I leave that part of the test in?! --- .../skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml b/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml index c3031feb4..adefa746b 100644 --- a/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml +++ b/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml @@ -21,7 +21,7 @@ Date: Fri, 13 Jan 2012 03:23:20 -0500 Subject: [PATCH 2/4] Spelling fix: Query only has on r. --- indra/newview/app_settings/settings_ascent.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml index 6d61d9f50..ec2b81116 100644 --- a/indra/newview/app_settings/settings_ascent.xml +++ b/indra/newview/app_settings/settings_ascent.xml @@ -579,7 +579,7 @@ AscentCmdLineKeyToName Comment - Use a fast key to name querry + Use a fast key to name query Persist 1 Type From 6bbff07e00efe65205d69d8f7e424cdecce47dde Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Fri, 13 Jan 2012 19:14:14 +0100 Subject: [PATCH 3/4] UI Purdyness --- indra/llui/llbutton.cpp | 11 +++++++++-- .../skins/default/textures/icn_toolbar_build.tga | Bin 138 -> 22 bytes .../skins/default/textures/icn_toolbar_fly.tga | Bin 138 -> 22 bytes .../default/textures/icn_toolbar_inventory.tga | Bin 138 -> 22 bytes .../skins/default/textures/icn_toolbar_map.tga | Bin 138 -> 22 bytes .../default/textures/icn_toolbar_minimap.tga | Bin 138 -> 22 bytes .../skins/default/textures/icn_toolbar_radar.tga | Bin 138 -> 22 bytes .../default/textures/icn_toolbar_search.tga | Bin 138 -> 22 bytes .../default/textures/icn_toolbar_snapshot.tga | Bin 138 -> 22 bytes .../default/textures/icon_net_close_circuit.tga | Bin .../textures/icon_net_close_circuit_gray.tga | Bin .../textures/icon_net_close_eventpoll.tga | Bin .../textures/icon_net_close_eventpoll_gray.tga | Bin indra/newview/skins/default/textures/preview.png | Bin .../default/xui/en-us/floater_object_backup.xml | 0 .../default/xui/en-us/panel_voice_controls.xml | 2 +- 16 files changed, 10 insertions(+), 3 deletions(-) mode change 100755 => 100644 indra/newview/skins/default/textures/icon_net_close_circuit.tga mode change 100755 => 100644 indra/newview/skins/default/textures/icon_net_close_circuit_gray.tga mode change 100755 => 100644 indra/newview/skins/default/textures/icon_net_close_eventpoll.tga mode change 100755 => 100644 indra/newview/skins/default/textures/icon_net_close_eventpoll_gray.tga mode change 100755 => 100644 indra/newview/skins/default/textures/preview.png mode change 100755 => 100644 indra/newview/skins/default/xui/en-us/floater_object_backup.xml diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 0f36c8443..e508e6837 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -611,9 +611,10 @@ void LLButton::draw() S32 text_left = mLeftHPad; S32 text_right = getRect().getWidth() - mRightHPad; S32 text_width = getRect().getWidth() - mLeftHPad - mRightHPad; + S32 text_middle = text_left + text_width/2; // draw overlay image - if (mImageOverlay.notNull()) + if (mImageOverlay.notNull() && mImageOverlay->getWidth() > 1) { // get max width and height (discard level 0) S32 overlay_width = mImageOverlay->getWidth(); @@ -645,6 +646,7 @@ void LLButton::draw() case LLFontGL::LEFT: text_left += overlay_width + 1; text_width -= overlay_width + 1; + text_middle += (overlay_width+1)/4; mImageOverlay->draw( mLeftHPad, center_y - (overlay_height / 2), @@ -663,6 +665,7 @@ void LLButton::draw() case LLFontGL::RIGHT: text_right -= overlay_width + 1; text_width -= overlay_width + 1; + text_middle += (overlay_width+1)/4; mImageOverlay->draw( getRect().getWidth() - mRightHPad - overlay_width, center_y - (overlay_height / 2), @@ -688,7 +691,10 @@ void LLButton::draw() x = text_right; break; case LLFontGL::HCENTER: - x = text_left + (text_width / 2); + { + S32 actual_width = mGLFont->getWidth(label.c_str()); + x = llmax(text_middle, text_left + actual_width/2); + } break; case LLFontGL::LEFT: default: @@ -704,6 +710,7 @@ void LLButton::draw() x++; } + mGLFont->render(label, 0, (F32)x, (F32)(LLBUTTON_V_PAD + y_offset), diff --git a/indra/newview/skins/default/textures/icn_toolbar_build.tga b/indra/newview/skins/default/textures/icn_toolbar_build.tga index e1a814b1ef55684d28fff0430f37ba5c18200a5e..0a1a235f352f836cc45efc94d8c745f1829bca07 100644 GIT binary patch literal 22 XcmZQzU}As)Mg~R(1&;s!|1$sp3NHgH literal 138 acmZQz;9`IQ2?hxU1&- -