#5755 fix for notifications layout

3 files changed, 40 insertions, 19 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7844e07d7c..dbc16ef47e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5892,6 +5892,17 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
+      <integer>90</integer>
+    </map>
+    <key>ScriptToastButtonWidth</key>
+    <map>
+      <key>Comment</key>
+      <string>Default width of buttons in the Script dialog toast.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
       <integer>110</integer>
     </map>
     <key>NotificationChannelRightMargin</key>
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index 846642841a..8a7095f8ca 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -46,7 +46,7 @@
 
 const S32 BOTTOM_PAD = VPAD * 3;
 const S32 IGNORE_BTN_TOP_DELTA = 3*VPAD;//additional ignore_btn padding
-S32 BUTTON_WIDTH = 110;
+const S32 BUTTON_WIDTH = 90;
 
 
 //static
@@ -58,7 +58,8 @@ LLToastNotifyPanel::button_click_signal_t LLToastNotifyPanel::sButtonClickSignal
 LLToastNotifyPanel::LLToastNotifyPanel(const LLNotificationPtr& notification, const LLRect& rect, bool show_images)
 :   LLCheckBoxToastPanel(notification)
 ,   LLInstanceTracker<LLToastNotifyPanel, LLUUID, LLInstanceTrackerReplaceOnCollision>(notification->getID())
-,   mTextBox(NULL)
+,   mTextBox(NULL),
+    mButtonWidth(BUTTON_WIDTH)
 {
     init(rect, show_images);
 }
@@ -69,9 +70,9 @@ void LLToastNotifyPanel::addDefaultButton()
     LLButton* ok_btn = createButton(form_element, false);
     LLRect new_btn_rect(ok_btn->getRect());
 
-    new_btn_rect.setOriginAndSize(llabs(getRect().getWidth() - BUTTON_WIDTH)/ 2, BOTTOM_PAD,
+    new_btn_rect.setOriginAndSize(llabs(getRect().getWidth() - mButtonWidth) / 2, BOTTOM_PAD,
             //auto_size for ok button makes it very small, so let's make it wider
-            BUTTON_WIDTH, new_btn_rect.getHeight());
+            mButtonWidth, new_btn_rect.getHeight());
     ok_btn->setRect(new_btn_rect);
     addChild(ok_btn, -1);
     mNumButtons = 1;
@@ -98,7 +99,7 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, bool is_opt
     p.font = font;
     p.rect.height = BTN_HEIGHT;
     p.click_callback.function(boost::bind(&LLToastNotifyPanel::onClickButton, userdata));
-    p.rect.width = BUTTON_WIDTH;
+    p.rect.width = mButtonWidth;
     p.auto_resize = false;
     p.follows.flags(FOLLOWS_LEFT | FOLLOWS_BOTTOM);
     p.enabled = !form_element.has("enabled") || form_element["enabled"].asBoolean();
@@ -108,7 +109,7 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, bool is_opt
         p.image_color_disabled(LLUIColorTable::instance().getColor("ButtonCautionImageColor"));
     }
     // for the scriptdialog buttons we use fixed button size. This  is a limit!
-    if (!mIsScriptDialog && font->getWidth(form_element["text"].asString()) > (BUTTON_WIDTH-2*HPAD))
+    if (!mIsScriptDialog && font->getWidth(form_element["text"].asString()) > (mButtonWidth - 2 * HPAD))
     {
         p.rect.width = 1;
         p.auto_resize = true;
@@ -273,7 +274,7 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
     mInfoPanel = getChild<LLPanel>("info_panel");
 
     mControlPanel = getChild<LLPanel>("control_panel");
-    BUTTON_WIDTH = gSavedSettings.getS32("ToastButtonWidth");
+
     // customize panel's attributes
     // is it intended for displaying a tip?
     mIsTip = mNotification->getType() == "notifytip";
@@ -282,6 +283,10 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
     // is it a script dialog?
     mIsScriptDialog = (notif_name == "ScriptDialog" || notif_name == "ScriptDialogGroup");
 
+    static LLCachedControl<S32> btn_width(gSavedSettings, "ToastButtonWidth", 90);
+    static LLCachedControl<S32> script_button_width(gSavedSettings, "ScriptToastButtonWidth", 110);
+    mButtonWidth = mIsScriptDialog ? script_button_width : btn_width;
+
     bool is_content_trusted = (notif_name != "LoadWebPage");
     // is it a caution?
     //
@@ -365,17 +370,20 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
             S32 button_panel_width = mControlPanel->getRect().getWidth();// get initial width from XML
             S32 button_panel_height = mControlPanel->getRect().getHeight();
 
-            // width for 3 columns: 3 buttons + 2 gaps
-            S32 min_width_required = 3 * BUTTON_WIDTH + 2 * (2 * HPAD);
-            if (min_width_required > button_panel_width)
+            // Script dialog has wider buttons so it requires wider layout to ensure proper spacing
+            if (mIsScriptDialog)
             {
-                button_panel_width = min_width_required;
-                S32 width_increase = button_panel_width - mControlPanel->getRect().getWidth();
-                reshape(getRect().getWidth() + width_increase, getRect().getHeight());
-                mInfoPanel->reshape(mInfoPanel->getRect().getWidth() + width_increase, mInfoPanel->getRect().getHeight());
-                mTextBox->reshape(mTextBox->getRect().getWidth() + width_increase, mTextBox->getRect().getHeight());
+                // width for 3 columns: 3 buttons + 2 gaps
+                S32 min_width_required = 3 * mButtonWidth + 2 * (2 * HPAD);
+                if (min_width_required > button_panel_width)
+                {
+                    button_panel_width = min_width_required;
+                    S32 width_increase = button_panel_width - mControlPanel->getRect().getWidth();
+                    reshape(getRect().getWidth() + width_increase, getRect().getHeight());
+                    mInfoPanel->reshape(mInfoPanel->getRect().getWidth() + width_increase, mInfoPanel->getRect().getHeight());
+                    mTextBox->reshape(mTextBox->getRect().getWidth() + width_increase, mTextBox->getRect().getHeight());
+                }
             }
-
             //try get an average h_pad to spread out buttons
             S32 h_pad = (button_panel_width - buttons_width) / (S32(buttons.size()));
             if(h_pad < 2*HPAD)
@@ -385,8 +393,8 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
                  * for a scriptdialog toast h_pad can be < 2*HPAD if we have a lot of buttons.
                  * In last case set default h_pad to avoid heaping of buttons
                  */
-                S32 button_per_row = button_panel_width / BUTTON_WIDTH;
-                h_pad = (button_panel_width % BUTTON_WIDTH) / (button_per_row - 1);// -1  because we do not need space after last button in a row
+                S32 button_per_row = button_panel_width / mButtonWidth;
+                h_pad = (button_panel_width % mButtonWidth) / (button_per_row - 1);// -1  because we do not need space after last button in a row
                 if(h_pad < 2*HPAD) // still not enough space between buttons ?
                 {
                     h_pad = 2*HPAD;
@@ -397,7 +405,7 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
                 // we are using default width for script buttons so we can determinate button_rows
                 // to get a number of rows we divide the required width of the buttons to button_panel_width
                 // buttons.size() is reduced by -2 due to presence of ignore button which is calculated independently a bit lower
-                S32 button_rows = llceil(F32(buttons.size() - 2) * (BUTTON_WIDTH + h_pad) / (button_panel_width + h_pad));
+                S32 button_rows = llceil(F32(buttons.size() - 2) * (mButtonWidth + h_pad) / (button_panel_width + h_pad));
                 //reserve one row for the ignore_btn
                 button_rows++;
                 //calculate required panel height for scripdialog notification.
diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h
index d694513aba..71b9eaf8f5 100644
--- a/indra/newview/lltoastnotifypanel.h
+++ b/indra/newview/lltoastnotifypanel.h
@@ -134,6 +134,8 @@ protected:
     S32 mNumOptions { 0 };
     S32 mNumButtons { 0 };
 
+    S32 mButtonWidth;
+
     static const std::string sFontDefault;
     static const std::string sFontScript;
 };