#4681 Viewer Flat UI

indra/llui/llaccordionctrltab.cpp

@@ -39,7 +39,7 @@ static const std::string DD_BUTTON_NAME = "dd_button";
 static const std::string DD_TEXTBOX_NAME = "dd_textbox";
 static const std::string DD_HEADER_NAME = "dd_header";
 
-static const S32 HEADER_HEIGHT = 23;
+static const S32 HEADER_HEIGHT = 25;
 static const S32 HEADER_IMAGE_LEFT_OFFSET = 5;
 static const S32 HEADER_TEXT_LEFT_OFFSET = 30;
 static const F32 AUTO_OPEN_TIME = 1.f;

indra/llui/lllineeditor.cpp

@@ -1954,12 +1954,11 @@ void LLLineEditor::draw()
             width = llmin(width, mTextRightEdge - ll_round(rendered_pixels_right));
             gl_rect_2d(ll_round(rendered_pixels_right), cursor_top, ll_round(rendered_pixels_right)+width, cursor_bottom, color);
 
-            LLColor4 tmp_color( 1.f - text_color.mV[0], 1.f - text_color.mV[1], 1.f - text_color.mV[2], alpha );
             rendered_text += mFontBufferSelection.render(
                 mGLFont,
                 mText, mScrollHPos + rendered_text,
                 rendered_pixels_right, text_bottom,
-                tmp_color,
+                LLColor4::black,
                 LLFontGL::LEFT, LLFontGL::BOTTOM,
                 0,
                 LLFontGL::NO_SHADOW,

indra/newview/llcolorswatch.cpp

@@ -200,13 +200,14 @@ void LLColorSwatchCtrl::draw()
     F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency();
 
     mBorder->setKeyboardFocusHighlight(hasFocus());
-    // Draw border
-    LLRect border( 0, getRect().getHeight(), getRect().getWidth(), mLabelHeight );
-    gl_rect_2d( border, mBorderColor.get(), false );
 
-    LLRect interior = border;
+    LLRect gl_border(0, getRect().getHeight(), getRect().getWidth(), mLabelHeight);
+    LLColor4 gl_border_color = mBorderColor.get();
+    LLRect interior = gl_border;
     interior.stretch( -1 );
 
+    bool show_border_ctrl = true;
+
     // Check state
     if ( mValid )
     {
@@ -239,7 +240,9 @@ void LLColorSwatchCtrl::draw()
     {
         if (mFallbackImage.notNull())
         {
-            mFallbackImage->draw(interior.mLeft, interior.mBottom, interior.getWidth(), interior.getHeight(), LLColor4::white % alpha);
+            mFallbackImage->draw(interior.mLeft - 1, interior.mBottom - 1, mFallbackImage->getWidth(), mFallbackImage->getHeight(), LLColor4::white % alpha);
+            gl_border_color = LLUIColorTable::instance().getColor("ColorSwatchBorderColorGray").get();
+            show_border_ctrl = false;
         }
         else
         {
@@ -250,6 +253,11 @@ void LLColorSwatchCtrl::draw()
         }
     }
 
+    mBorder->setVisible(show_border_ctrl);
+
+    // Draw border
+    gl_rect_2d(gl_border, gl_border_color, false);
+
     LLUICtrl::draw();
 }
 

indra/newview/llpanelface.cpp

@@ -1904,7 +1904,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
         if (mColorSwatch)
         {
             mColorSwatch->setEnabled( false );
-            mColorSwatch->setFallbackImage(LLUI::getUIImage("locked_image.j2c") );
+            mColorSwatch->setFallbackImage(LLUI::getUIImage("locked_image") );
             mColorSwatch->setValid(false);
         }
 

indra/newview/skins/default/colors.xml

@@ -4,13 +4,13 @@
 	<!-- Named Colors -->
 	<color
 	 name="EmphasisColor"
-	 value="0.38 0.694 0.573 1" />
+	 value="0.3 0.82 1 1" />
 	<color
 	 name="EmphasisColor_13"
-	 value="0.38 0.694 0.573 0.13" />
+	 value="0.3 0.82 1 0.13" />
 	<color
 	 name="EmphasisColor_35"
-	 value="0.38 0.694 0.573 0.35" />
+	 value="0.3 0.82 1 0.35" />
 	<color
 	 name="BeaconColor"
     value="0.749 0.298 0 1" />	 
@@ -338,7 +338,7 @@
      reference="EmphasisColor" />
     <color
      name="ConversationFriendColor"
-     value="0.42 0.85 0.71 1" />
+     reference="EmphasisColor" />
     <color
      name="DefaultHighlightDark"
      reference="White_10" />
@@ -359,7 +359,7 @@
      reference="Black" />
     <color
      name="FilterTextColor"
-     value="0.38 0.69 0.57 1" />
+     reference="EmphasisColor" />
      <color
      name="FloaterButtonImageColor"
      reference="LtGray" />
@@ -377,7 +377,7 @@
      reference="Black_50" />
     <color
      name="FocusColor"
-     reference="EmphasisColor" />
+     reference="white" />
     <color
      name="FolderViewLoadingMessageTextColor"
      value="0.3344 0.5456 0.5159 1" />
@@ -453,9 +453,6 @@
     <color
      name="InventoryBackgroundColor"
      reference="DkGray2" />
-    <color
-     name="InventoryFavoriteColor"
-     reference="Yellow" />
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
@@ -595,7 +592,7 @@
      reference="White" />
     <color
      name="NameTagFriend"
-     value="0.447 0.784 0.663 1" />
+     reference="EmphasisColor" />
     <color
      name="NameTagLegacy"
      reference="White" />
@@ -761,6 +758,9 @@
     <color
      name="SelectedOutfitTextColor"
      reference="EmphasisColor" />
+    <color
+     name="WornOutfitTextColor"
+     value="0.54 0.73 0.87 1" />
     <color
      name="SearchableControlHighlightFontColor"
      value="1 0 0 1" />
@@ -862,19 +862,25 @@
     <color
     name="ColorSwatchBorderColor"
     value="0.45098 0.517647 0.607843 1"/>
+    <color
+    name="ColorSwatchBorderColorGray"
+    value="0.329 0.329 0.329 1"/>
     <color
      name="ChatTeleportSeparatorColor"
      reference="Black" />
     <color
      name="ChatTimestampColor"
      reference="White" />
+    <color
+      name="MenuBarStreamingBgColor"
+      reference="DkGray" />
     <color
       name="MenuBarBetaBgColor"
       reference="DkBlue" />
-  <color
-     name="MenuBarProjectBgColor"
-     reference="MdBlue" />
-  <color
+    <color
+      name="MenuBarProjectBgColor"
+      reference="MdBlue" />
+    <color
       name="MenuBarTestBgColor"
       reference="DkRed" />
     <color
@@ -984,7 +990,7 @@
     value="1 0.14 0 1" />
   <color
     name="OutfitGalleryItemSelected"
-    value="0.22 0.45 0.35 1" />
+    value="0.26 0.36 0.47 1"/>
   <color
     name="OutfitGalleryItemWorn"
     value="0.33 0.58 0.47 1" />

indra/newview/skins/default/textures/textures.xml

@@ -648,6 +648,8 @@ with the same filename but different name
   <texture name="OBJECT_Icon" file_name="icons/object_icon.png" preload="true" />
   <texture name="Unknown_Icon" file_name="icons/unknown_icon.png" preload="true" />
 
+  <texture name="Square_Selection" file_name="square_selection.png" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
+
   <texture name="Snapshot_Off" file_name="bottomtray/Snapshot_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
   <texture name="Snapshot_Download" file_name="snapshot_download.png" preload="false" />
   <texture name="Snapshot_Email" file_name="snapshot_email.png" preload="false" />
@@ -685,6 +687,15 @@ with the same filename but different name
   <texture name="TabIcon_Places_Off" file_name="taskpanel/TabIcon_Places_Off.png" preload="false" />
   <texture name="TabIcon_Things_Off" file_name="taskpanel/TabIcon_Things_Off.png" preload="false" />
 
+  <texture name="TabLeft_Flat_Off" file_name="containers/TabLeft_Flat_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="TabLeft_Flat_Selected" file_name="containers/TabLeft_Flat_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="TabTop_First_Flat_Off" file_name="containers/TabTop_First_Flat_Off.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+  <texture name="TabTop_Last_Flat_Off" file_name="containers/TabTop_Last_Flat_Off.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+  <texture name="TabTop_Middle_Flat_Off" file_name="containers/TabTop_Middle_Flat_Off.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+  <texture name="TabTop_First_Flat_Selected" file_name="containers/TabTop_First_Flat_Selected.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+  <texture name="TabTop_Last_Flat_Selected" file_name="containers/TabTop_Last_Flat_Selected.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+  <texture name="TabTop_Middle_Flat_Selected" file_name="containers/TabTop_Middle_Flat_Selected.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
+
   <texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
   <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
   <texture name="TabTop_Right_Flashing" file_name="containers/TabTop_Right_Flashing.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
@@ -702,6 +713,7 @@ with the same filename but different name
   <texture name="TextField_Search_Off" file_name="widgets/TextField_Search_Off.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="TextField_Disabled" file_name="widgets/TextField_Disabled.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+  <texture name="TextField_Highlight" file_name="widgets/TextField_Highlight.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="TextField_Search_Highlight" file_name="widgets/TextField_Search_Highlight.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
 
   <texture name="Thumbnail_Fallback" file_name="icons/thumbnail_fallback_icon.png" preload="true" />
@@ -864,6 +876,7 @@ with the same filename but different name
   <texture name="badge_warn.j2c" />
   <texture name="badge_ok.j2c" />
   <texture name="materials_ui_x_24.png" />
+  <texture name="locked_image" file_name="locked_image_dark.png" preload="true"/>
 
   <texture name="Progress_1" file_name="icons/Progress_1.png" preload="true" />
   <texture name="Progress_2" file_name="icons/Progress_2.png" preload="true" />

indra/newview/skins/default/xui/en/floater_preferences.xml

@@ -82,8 +82,8 @@
      name="pref core"
      tab_group="1"
      tab_position="left"
-     tab_width="140"
-     tab_padding_right="0"
+     tab_width="136"
+     tab_padding_right="4"
      top="40"
      width="658">
         <panel

indra/newview/skins/default/xui/en/panel_navigation_bar.xml

@@ -89,7 +89,7 @@
 	         image_hover_unselected="PushButton_Over"
 	         image_bottom_pad="1"
 	         layout="topleft"
-	         left="10"
+	         left="9"
 	         name="back_btn"
 	         tool_tip="Go back to previous location"
 	         top="2"
@@ -102,7 +102,7 @@
 	         image_hover_unselected="PushButton_Over"
 	         image_bottom_pad="1"
 	         layout="topleft"
-	         left_pad="0"
+	         left_pad="1"
 	         name="forward_btn"
 	         tool_tip="Go forward one location"
 	         top_delta="0"

indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml

@@ -121,7 +121,7 @@
       Better
   </text>
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
@@ -130,15 +130,15 @@
     top_delta="-2"
     width="2" />
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
     left_pad="41"
     name="LowMidGraphicsDivet"
     width="2" />
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
@@ -147,7 +147,7 @@
     top_delta="0"
     width="2" />
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
@@ -156,7 +156,7 @@
     top_delta="0"
     width="2" />
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
@@ -165,7 +165,7 @@
     top_delta="0"
     width="2" />
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
@@ -174,7 +174,7 @@
     top_delta="0"
     width="2" />
   <icon
-    color="DkGray"
+    color="DkGray0"
     height="14"
     image_name="Rounded_Square"
     layout="topleft"

indra/newview/skins/default/xui/en/panel_preferences_sound.xml

@@ -603,7 +603,7 @@
    label="Voice Input/Output devices"
    layout="topleft"
    left="20"
-   top_pad="0"
+   top_pad="1"
    name="device_settings_btn"
    width="200">
   </button>

indra/newview/skins/default/xui/en/sidepanel_appearance.xml

@@ -50,24 +50,14 @@ width="333">
       layout="topleft"
       name="openoutfit_btn"
       visible="false" />
-      <icon
-      follows="top|left"
-      height="31"
-      image_name="Shirt_Large"
-      name="outfit_icon"
-      mouse_opaque="false"
-      visible="true"
-      left="1"
-      top="0"
-      width="31" />
       <text
-      font="SansSerifSmall"
+      font="SansSerifSmallBold"
       text_color="EmphasisColor"
       width="300"
       height="13"
       follows="top|left|right"
       layout="topleft"
-      left="35"
+      left="5"
       top="3"
       mouse_opaque="false"
       name="currentlook_status" >
@@ -76,7 +66,7 @@ width="333">
       <text
       font="SansSerifLargeBold"
       height="20"
-      left="35"
+      left="5"
       parse_urls="false"
       text_color="White"
       top="15"

indra/newview/skins/default/xui/en/widgets/button.xml

@@ -11,7 +11,7 @@
         image_top_pad="0"
         image_bottom_pad="0"
         imgoverlay_label_space="1"
-        label_color="ButtonLabelColor"
+        label_color="White"
         label_color_selected="ButtonLabelSelectedColor"
         label_color_disabled="ButtonLabelDisabledColor"
         label_color_disabled_selected="ButtonLabelSelectedDisabledColor"
@@ -24,6 +24,7 @@
         pad_bottom="1"
         height="23"
         scale_image="true"
+        label_shadow="false"
         handle_right_mouse="true"
         use_draw_context_alpha="true"
         held_down_delay.seconds="0.5"

indra/newview/skins/default/xui/en/widgets/filter_editor.xml

@@ -7,10 +7,10 @@
   select_on_focus="true"
   text_tentative_color="TextFgTentativeColor"
   highlight_text_field="true"
-  background_image="TextField_Search_Off"
-  background_image_disabled="TextField_Search_Disabled"
-  background_image_focused="TextField_Search_Active"
-  background_image_highlight="TextField_Search_Highlight">
+  background_image="TextField_Off"
+  background_image_disabled="TextField_Disabled"
+  background_image_focused="TextField_Active"
+  background_image_highlight="TextField_Highlight">
   <search_button label=""
     top_pad="4"
     left_pad="4"