Floaters and UI controls adjustments #2

12 files changed, 31 insertions, 25 deletions

diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 0048c44189..3a3616c905 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -842,8 +842,7 @@ void LLButton::draw()
     // overlay with keyboard focus border
     if (hasFocus())
     {
-        F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
-        drawBorder(imagep, gFocusMgr.getFocusColor() % alpha, ll_round(lerp(1.f, 3.f, lerp_amt)));
+        drawBorder(imagep, gFocusMgr.getFocusColor() % alpha, gFocusMgr.getFocusFlashWidth());
     }
 
     if (use_glow_effect)
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 7544a44478..ce0e8036e7 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -464,6 +464,11 @@ F32 LLFocusMgr::getFocusFlashAmt() const
     return clamp_rescale(mFocusFlashTimer.getElapsedTimeF32(), 0.f, FOCUS_FADE_TIME, 1.f, 0.f);
 }
 
+S32 LLFocusMgr::getFocusFlashWidth() const
+{
+    return ll_round(lerp(1.f, 2.f, getFocusFlashAmt()));
+}
+
 LLColor4 LLFocusMgr::getFocusColor() const
 {
     static LLUIColor focus_color_cached = LLUIColorTable::instance().getColor("FocusColor");
diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h
index 89fee5c9f1..2e2293196b 100644
--- a/indra/llui/llfocusmgr.h
+++ b/indra/llui/llfocusmgr.h
@@ -101,7 +101,7 @@ public:
     void            setKeystrokesOnly(bool keystrokes_only) { mKeystrokesOnly = keystrokes_only; }
 
     F32             getFocusFlashAmt() const;
-    S32             getFocusFlashWidth() const { return ll_round(lerp(1.f, 3.f, getFocusFlashAmt())); }
+    S32             getFocusFlashWidth() const;
     LLColor4        getFocusColor() const;
     void            triggerFocusFlash();
     bool            getAppHasFocus() const { return mAppHasFocus; }
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 3ab5e905e3..35477bdea9 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -408,6 +408,7 @@ public:
     /*virtual*/ void        setColor(const LLUIColor& c) override;
     virtual     void        setReadOnlyColor(const LLUIColor& c);
     /*virtual*/ void        onVisibilityChange(bool new_visibility) override;
+    void                    setBgReadOnlyColor(const LLUIColor& c) { mReadOnlyBgColor = c; }
 
     /*virtual*/ void        setValue(const LLSD& value) override;
     /*virtual*/ LLTextViewModel* getViewModel() const override;
diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp
index d53fd6eb91..68ca61681c 100644
--- a/indra/llui/llviewborder.cpp
+++ b/indra/llui/llviewborder.cpp
@@ -149,7 +149,7 @@ void LLViewBorder::drawOnePixelLines()
         top_color = gFocusMgr.getFocusColor();
         bottom_color = top_color;
 
-        LLUI::setLineWidth(lerp(1.f, 3.f, gFocusMgr.getFocusFlashAmt()));
+        LLUI::setLineWidth(lerp(1.f, 2.f, gFocusMgr.getFocusFlashAmt()));
     }
 
     S32 left    = 0;
diff --git a/indra/newview/llnotificationlistitem.cpp b/indra/newview/llnotificationlistitem.cpp
index 9a33bcb1b9..4939cd5fbb 100644
--- a/indra/newview/llnotificationlistitem.cpp
+++ b/indra/newview/llnotificationlistitem.cpp
@@ -175,13 +175,15 @@ void LLNotificationListItem::onMouseEnter(S32 x, S32 y, MASK mask)
 {
     mCondensedViewPanel->setTransparentColor(LLUIColorTable::instance().getColor( "ScrollHoveredColor" ));
     mExpandedViewPanel->setTransparentColor(LLUIColorTable::instance().getColor( "ScrollHoveredColor" ));
+    mNoticeTextExp->setBgReadOnlyColor(LLUIColorTable::instance().getColor("SelectedBgReadOnlyColor"));
 }
 
 void LLNotificationListItem::onMouseLeave(S32 x, S32 y, MASK mask)
 {
     mCondensedViewPanel->setTransparentColor(LLUIColorTable::instance().getColor( "SysWellItemUnselected" ));
     mExpandedViewPanel->setTransparentColor(LLUIColorTable::instance().getColor( "SysWellItemUnselected" ));
-}
+    mNoticeTextExp->setBgReadOnlyColor(LLUIColorTable::instance().getColor("TextBgReadOnlyColor"));
+ }
 
 //static
 LLNotificationListItem* LLNotificationListItem::create(const Params& p)
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index ab094fc1cd..a686a3f20e 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -6,14 +6,14 @@
 	 name="EmphasisColor"
 	 value="0.3 0.82 1 1" />
 	<color
-	 name="EmphasisColor_13"
-	 value="0.3 0.82 1 0.13" />
-	<color
 	 name="EmphasisColor_35"
 	 value="0.426 0.729 1.0 0.368" />
     <color
      name="SelectionColor"
      value="0.706 0.851 1 1" />
+    <color
+     name="ScrollHoveredColor"
+     value="0.18 0.26 0.33 1" />
 	<color
 	 name="BeaconColor"
     value="0.749 0.298 0 1" />	 
@@ -741,9 +741,6 @@
      name="ScrollHighlightedColor"
      reference="Unused?" />
     <color
-     name="ScrollHoveredColor"
-     reference="EmphasisColor_13" />
-    <color
      name="ScrollSelectedBGColor"
      reference="EmphasisColor_35" />
     <color
@@ -795,6 +792,9 @@
      name="SystemChatColor"
      reference="LtGray" />
     <color
+     name="SelectedBgReadOnlyColor"
+     value="0.15 0.21 0.27 1" />
+    <color
      name="TextBgFocusColor"
      reference="White" />
     <color
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 adbce0d982..0c82cbb00c 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -63,7 +63,7 @@
              layout="topleft"
              left="10"
              name="InstructSearchResidentName"
-             top="8"
+             top="7"
              width="220">
                 Type part of a person&apos;s name:
             </text>
@@ -76,7 +76,7 @@
              height="23"
              left_delta="0"
              name="Edit"
-             top_pad="0"
+             top_pad="3"
              width="65" />
             <button
              follows="top|right"
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 0c88f043fd..17631ad30c 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -29,7 +29,7 @@
      control_name="BulkChangeIncludeAnimations"
      height="16"
      name="check_animation"
-     top="24"
+     top="30"
      left="10"
      width="16" />
     <icon
@@ -73,7 +73,7 @@
      name="check_gesture"
      left="95"
      width="16"
-     top="25" />
+     top="30" />
     <icon
      height="16"
      image_name="Inv_Gesture"
@@ -116,7 +116,7 @@
      control_name="BulkChangeIncludeScripts"
      height="16"
      name="check_script"
-     top="25"
+     top="30"
      left="180"
      width="16"
      />
@@ -161,7 +161,7 @@
     height="16"
     name="check_settings"
     left="245"
-    top="25"
+    top="30"
     width="16" />
   <icon
     height="16"
diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index d85c0d84bf..88fd8bf585 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -41,7 +41,7 @@
                     mouse_opaque="true"
                     name="icon_settingsdays"
                     left="4"
-                    top="6"
+                    top="9"
                     width="16" />
             <check_box
                     height="16"
@@ -58,7 +58,7 @@
                     mouse_opaque="true"
                     name="icon_settingsskies"
                     left_pad="10"
-                    top="6"
+                    top="9"
                     width="16" />
             <check_box
                     height="16"
@@ -75,7 +75,7 @@
                     mouse_opaque="true"
                     name="icon_settingswater"
                     left_pad="10"
-                    top="6"
+                    top="9"
                     width="16" />
             <check_box
                     height="16"
@@ -92,7 +92,7 @@
                   layout="topleft"
                   left="4"
                   name="flt_search"
-                  top_pad="6"
+                  top_pad="4"
                   right="-4" />
         </layout_panel>
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index dd2839373c..d94a6c71b5 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -618,7 +618,7 @@
      layout="topleft"
      left_delta="0"
      name="checkbox copy selection"
-     top_delta="15"
+     top_delta="17"
      width="134" />
     <check_box
      control_name="CreateToolCopyCenters"
@@ -628,7 +628,7 @@
      layout="topleft"
      left_delta="18"
      name="checkbox copy centers"
-     top="85"
+     top="92"
      width="134" />
     <check_box
      control_name="CreateToolCopyRotates"
@@ -637,7 +637,7 @@
      layout="topleft"
      left_delta="0"
      name="checkbox copy rotates"
-     top_delta="16"
+     top_delta="17"
      width="134" />
     <radio_group
      height="105"
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index 6509c8c1f3..53d1e18a84 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -11,5 +11,4 @@
     header_image_focused="Accordion_Selected"
     header_text_color="AccordionHeaderTextColor"
     font="SansSerif"
-    font.size="Small"
     />