#5462 update button and menu colors

7 files changed, 22 insertions, 7 deletions

diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 6ffc707b25..7f209c60a7 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -110,6 +110,8 @@ LLButton::Params::Params()
     commit_on_capture_lost("commit_on_capture_lost", false),
     display_pressed_state("display_pressed_state", true),
     use_draw_context_alpha("use_draw_context_alpha", true),
+    draw_focus_border("draw_focus_border", true),
+    hover_hand_cursor("hover_hand_cursor", false),
     badge("badge"),
     handle_right_mouse("handle_right_mouse"),
     held_down_delay("held_down_delay"),
@@ -181,6 +183,8 @@ LLButton::LLButton(const LLButton::Params& p)
     mMouseUpSignal(NULL),
     mHeldDownSignal(NULL),
     mUseDrawContextAlpha(p.use_draw_context_alpha),
+    mDrawFocusBorder(p.draw_focus_border),
+    mHoverHandCursor(p.hover_hand_cursor),
     mHandleRightMouse(p.handle_right_mouse),
     mFlashingTimer(NULL)
 {
@@ -655,7 +659,7 @@ bool LLButton::handleHover(S32 x, S32 y, MASK mask)
         }
 
         // We only handle the click if the click both started and ended within us
-        getWindow()->setCursor(UI_CURSOR_ARROW);
+        getWindow()->setCursor(mHoverHandCursor ? UI_CURSOR_HAND : UI_CURSOR_ARROW);
         LL_DEBUGS("UserInput") << "hover handled by " << getName() << LL_ENDL;
     }
     return true;
@@ -842,7 +846,7 @@ void LLButton::draw()
         label_color = ll::ui::SearchableControl::getHighlightFontColor();
 
     // overlay with keyboard focus border
-    if (hasFocus())
+    if (hasFocus() && mDrawFocusBorder)
     {
         drawBorder(imagep, gFocusMgr.getFocusColor() % alpha, gFocusMgr.getFocusFlashWidth());
     }
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index ac301d5149..0d1a28ee31 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -133,7 +133,9 @@ public:
         Optional<F32>               hover_glow_amount;
         Optional<TimeIntervalParam> held_down_delay;
 
-        Optional<bool>              use_draw_context_alpha;
+        Optional<bool>              use_draw_context_alpha,
+                                    draw_focus_border,
+                                    hover_hand_cursor;
 
         Optional<LLBadge::Params>   badge;
 
@@ -367,6 +369,8 @@ protected:
     S32                         mImageOverlayBottomPad;
 
     bool                        mUseDrawContextAlpha;
+    bool                        mDrawFocusBorder;
+    bool                        mHoverHandCursor;
 
     /*
      * Space between image_overlay and label
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index a55e58f4bb..1dc80671cc 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -119,7 +119,7 @@ S32 LLLayoutPanel::getTargetDim() const
 void LLLayoutPanel::setTargetDim(S32 value)
 {
     value = llmin(value, mMaxDim);
-    
+
     LLRect new_rect(getRect());
     if (mOrientation == LLLayoutStack::HORIZONTAL)
     {
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index dbcf4fbbf4..ca01d048b4 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -649,7 +649,7 @@ void init_menus()
     LLRect menuBarRect = gLoginMenuBarView->getRect();
     menuBarRect.setLeftTopAndSize(0, menu_bar_holder->getRect().getHeight(), menuBarRect.getWidth(), menuBarRect.getHeight());
     gLoginMenuBarView->setRect(menuBarRect);
-    gLoginMenuBarView->setBackgroundColor( color );
+    gLoginMenuBarView->setBackgroundColor(LLColor4::black);
     menu_bar_holder->addChild(gLoginMenuBarView);
 
     // tooltips are on top of EVERYTHING, including menus
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login.png b/indra/newview/skins/default/textures/widgets/PushButton_Login.png
index 2180adb2fd..7e892d2b0a 100644
--- a/indra/newview/skins/default/textures/widgets/PushButton_Login.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Login.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png
index e2c3b297df..9110889d6c 100644
--- a/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 781cc700dd..f3d31fca40 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -103,6 +103,7 @@
      name="remember_name"
      tool_tip="Already remembered user can be forgotten from Me &gt; Preferences &gt; Advanced &gt; Remembered Usernames."
      width="198">
+        <check_box.label_text left="23"/>
         <check_box.check_button
          image_selected="Checkbox_Slim_On"
          image_unselected="Checkbox_Slim_Off"
@@ -136,6 +137,7 @@
      check_button.bottom="3"
      name="remember_password"
      width="165" >
+        <check_box.label_text left="23"/>
         <check_box.check_button
          image_selected="Checkbox_Slim_On"
          image_unselected="Checkbox_Slim_Off"
@@ -216,6 +218,7 @@
         font="SansSerif"
         label_color="Black"
         label_color_selected="Black"
+        draw_focus_border="false"
         image_overlay="ComboButton_Arrow"
         image_overlay_right_delta="10"
         image_unselected="TextField_Active"
@@ -231,10 +234,12 @@
      label="Log in"
      label_color="Black"
      label_color_disabled="Black"
-     font="SansSerifMedium"
+     font="SansSerifLarge"
      font.style="BOLD"
      name="connect_btn"
-     enabled="true"    
+     draw_focus_border="false"
+     hover_hand_cursor="true"
+     enabled="true"
      width="220"
      height="35"
      top_pad="25"
@@ -262,6 +267,8 @@
      font="SansSerifMedium"
      font.style="BOLD"
      name="sign_btn"
+     draw_focus_border="false"
+     hover_hand_cursor="true"
      width="220"
      height="35"
      left="40"