Adjust buttons and lists for font size being larger

14 files changed, 60 insertions, 38 deletions

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 6ba31c251e..3b21ed8f47 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -73,7 +73,7 @@ S32 MENU_BAR_WIDTH = 410;
 /// Local function declarations, constants, enums, and typedefs
 ///============================================================================
 
-const S32 LABEL_BOTTOM_PAD_PIXELS = 2;
+const S32 LABEL_BOTTOM_PAD_PIXELS = 1;
 
 const U32 LEFT_PAD_PIXELS = 3;
 const U32 LEFT_WIDTH_PIXELS = 15;
@@ -519,21 +519,25 @@ void LLMenuItemGL::draw( void )
     }
     else
     {
+        // Munus are all of the same size, so fixed offset works here,
+        // but it won't work if somebody decides to use different font
+        // todo: adjust logic to work of rect and font height
+        F32 y = (F32)MENU_ITEM_PADDING / 2.f;
         if( !mDrawBoolLabel.empty() )
         {
-            mFont->render( mDrawBoolLabel.getWString(), 0, (F32)LEFT_PAD_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f), color,
+            mFont->render( mDrawBoolLabel.getWString(), 0, (F32)LEFT_PAD_PIXELS, y, color,
                            LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, false );
         }
-        mFont->render( mLabel.getWString(), 0, (F32)LEFT_PLAIN_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f), color,
+        mFont->render( mLabel.getWString(), 0, (F32)LEFT_PLAIN_PIXELS, y, color,
                        LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, false );
         if( !mDrawAccelLabel.empty() )
         {
-            mFont->render( mDrawAccelLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PLAIN_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f), color,
+            mFont->render( mDrawAccelLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PLAIN_PIXELS, y, color,
                            LLFontGL::RIGHT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, false );
         }
         if( !mDrawBranchLabel.empty() )
         {
-            mFont->render( mDrawBranchLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PAD_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f), color,
+            mFont->render( mDrawBranchLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PAD_PIXELS, y, color,
                            LLFontGL::RIGHT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, false );
         }
     }
@@ -1638,6 +1642,9 @@ void LLMenuItemBranchDownGL::draw( void )
     {
         color = mDisabledColor.get();
     }
+    // Munus are all of the same size, so fixed offset works here,
+    // but it won't work if somebody decides to use different font
+    // todo: adjust logic to work of rect and font height
     getFont()->render( mLabel.getWString(), 0, (F32)getRect().getWidth() / 2.f, (F32)LABEL_BOTTOM_PAD_PIXELS, color,
                    LLFontGL::HCENTER, LLFontGL::BOTTOM, LLFontGL::NORMAL);
 
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 6bbca72065..3c849162df 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -86,7 +86,8 @@
      tool_tip="Focus"
      width="35"
      font="DejaVu"
-     font.size="LSmall">
+     font.size="LSmall"
+     pad_bottom="1">
         <button.commit_callback
          function="BuildTool.setTool"
          parameter="Focus" />
@@ -103,7 +104,8 @@
      tool_tip="Move"
      width="35"
      font="DejaVu"
-     font.size="LSmall">
+     font.size="LSmall"
+     pad_bottom="1">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Move" />
@@ -120,7 +122,8 @@
      tool_tip="Edit"
      width="35"
      font="DejaVu"
-     font.size="LSmall">
+     font.size="LSmall"
+     pad_bottom="1">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Edit" />
@@ -137,7 +140,8 @@
      tool_tip="Create"
      width="35"
      font="DejaVu"
-     font.size="LSmall">
+     font.size="LSmall"
+     pad_bottom="1">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Create" />
@@ -154,7 +158,8 @@
      tool_tip="Land"
      width="35"
      font="DejaVu"
-     font.size="LSmall">
+     font.size="LSmall"
+     pad_bottom="1">
 	  <button.commit_callback
 	     function="BuildTool.setTool"
 	     parameter="Land" />
@@ -300,7 +305,8 @@
      name="link_btn"
      width="50"
      font="DejaVu"
-     font.size="LSmall">
+     font.size="LSmall"
+     pad_bottom="1">
 	  <button.commit_callback
 	     function="BuildTool.LinkObjects"/>
     </button>
@@ -313,7 +319,8 @@
      name="unlink_btn"
      width="90"
      font="DejaVu"
-     font.size="LSmall">
+     font.size="LSmall"
+     pad_bottom="1">
 	  <button.commit_callback
 	     function="BuildTool.UnlinkObjects"/>
     </button>
@@ -1106,7 +1113,8 @@
 			 tool_tip="Choose a group to share this object's permissions"
 			 width="23"
              font="DejaVu"
-             font.size="LSmall" />
+             font.size="LSmall"
+             pad_bottom="1" />
             <check_box
              height="19"
              follows="left|top"
@@ -1130,7 +1138,8 @@
              tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
              width="80"
              font="DejaVu"
-             font.size="LSmall" />
+             font.size="LSmall"
+             pad_bottom="1" />
             <text
              type="string"
              length="1"
@@ -1644,9 +1653,7 @@ even though the user gets a free copy.
              top_pad="13"
              name="clipboard_size_btn"
              tool_tip="Paste options"
-             width="19"
-             font="DejaVu"
-             font.size="LSmall" />
+             width="19" />
             <text
              type="string"
              length="1"
@@ -3062,7 +3069,8 @@ even though the user gets a free copy.
              top="10"
              width="134"
              font="DejaVu"
-             font.size="LSmall" />
+             font.size="LSmall"
+             pad_bottom="1" />
             <button
              follows="left|top"
              height="23"
@@ -3072,7 +3080,8 @@ even though the user gets a free copy.
              name="button permissions"
              width="134"
              font="DejaVu"
-             font.size="LSmall" />
+             font.size="LSmall"
+             pad_bottom="1" />
             <filter_editor
              follows="left|top|right"
              label="Enter filter text"
@@ -3159,7 +3168,8 @@ even though the user gets a free copy.
          top_pad="4"
          width="125"
          font="DejaVu"
-         font.size="LSmall" />
+         font.size="LSmall"
+         pad_bottom="1" />
         <check_box
          control_name="ShowParcelOwners"
          height="19"
@@ -3197,7 +3207,8 @@ even though the user gets a free copy.
          top="172"
          width="125"
          font="DejaVu"
-         font.size="LSmall" />
+         font.size="LSmall"
+         pad_bottom="1" />
         <button
          follows="left|top"
          height="23"
@@ -3209,7 +3220,8 @@ even though the user gets a free copy.
          top_pad="4"
          width="125"
          font="DejaVu"
-         font.size="LSmall" />
+         font.size="LSmall"
+         pad_bottom="1" />
         <text
          type="string"
          length="1"
@@ -3235,7 +3247,8 @@ even though the user gets a free copy.
          top="276"
          width="125"
          font="DejaVu"
-         font.size="LSmall" />
+         font.size="LSmall"
+         pad_bottom="1" />
         <button
          follows="left|top"
          height="23"
@@ -3247,7 +3260,8 @@ even though the user gets a free copy.
          top_pad="4"
          width="125"
          font="DejaVu"
-         font.size="LSmall" />
+         font.size="LSmall"
+         pad_bottom="1" />
  </panel>
 <!-- end of tabs -->
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index ca6e94397d..f9b65e3f13 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -61,7 +61,7 @@
      left_pad="5"
      name="avatar_name"
      parse_urls="false"
-     top="6"
+     top="5"
      use_ellipses="true"
      value="(loading)"
      width="180" />
diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
index 5ac0bf54de..6b4312a22a 100644
--- a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
@@ -65,7 +65,7 @@
      left_pad="5"
      name="item_name"
      parse_urls="false"
-     top="6"
+     top="4"
      use_ellipses="true"
      width="180" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 4f48911376..dde2df7128 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -23,7 +23,7 @@
     <text
       parse_urls="false"
       allow_scroll="false"
-      v_pad = "6"
+      v_pad = "4"
       read_only = "true"
       follows="left|right"
       font.style="BOLD"
@@ -49,7 +49,7 @@
     left_pad="5"
     name="time_box"
     right="-5"
-    top="7"
+    top="5"
     value="23:30"
     width="110" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index ff6af88707..dff00e4e60 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -44,7 +44,7 @@
      layout="topleft"
      left_pad="5"
      name="group_name"
-     top="6"
+     top="4"
      use_ellipses="true"
      value="Unknown"
      width="242" />
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 4eccdd2aef..e2219f6d5c 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -117,7 +117,8 @@
     width="120"
     height="32"
   	left_pad="15"
-    bottom_delta="0" />
+    bottom_delta="0"
+    pad_bottom="1" />
   <text
     follows="left|top"
     font="SansSerifLarge"
diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
index d6ac71db94..968c7da998 100644
--- a/indra/newview/skins/default/xui/en/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/en/panel_login_first.xml
@@ -149,7 +149,8 @@
   	        left_pad="15"
             width="120"
             height="32"
-            top="0" />
+            top="0"
+            pad_bottom="1" />
           <text
             follows="left|top"
             font="SansSerifLarge"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
index 88da605e2b..4409feb23a 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -133,8 +133,7 @@
     left="460"
     top_delta="2"
     name="exceptions_btn"
-    width="100"
-    pad_bottom="2">
+    width="100">
   </button>
 
   <text
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 407c901cde..1e6d5dabc8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -355,8 +355,7 @@
     left="48"
     name="RenderExceptionsButton"
     top_delta="24"
-    width="100"
-    pad_bottom="2">
+    width="100">
     <button.commit_callback
       function="Pref.RenderExceptions"/>
   </button>
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 6836f9e636..c7669e81af 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -21,7 +21,7 @@
         font="SansSerifSmall"
         hover_glow_amount="0.15"
         halign="center"
-        pad_bottom="1"
+        pad_bottom="2"
         height="23"
         scale_image="true"
         label_shadow="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
index cf995e5833..ebe2fa07e2 100644
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -9,7 +9,7 @@
   left_pad="0"
   icon_pad="10"
   icon_width="20"
-  text_pad="7"
+  text_pad="5"
   text_pad_right="4"
   arrow_size="12"
   max_folder_item_overlap="2"
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
index bcc7772681..671cb37ca3 100644
--- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -12,7 +12,7 @@
   left_pad="5"
   icon_pad="4"
   icon_width="16"
-  text_pad="3"
+  text_pad="5"
   text_pad_right="4"
   text_pad_top="0"
   arrow_size="12"
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 8345911525..8d71ffbfb5 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -25,6 +25,7 @@
                         desired_height="24"
                         pad_left="10" 
                         pad_right="10"
+                        pad_bottom="1"
                         follows="left|top"
                         chrome="true"
                         image_overlay_alignment="left"