From 4b161b8839fa115947d8d580c575d9b91c88fbc9 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 17 Feb 2010 16:00:28 +0200
Subject: Fixed low bug EXT-4246 - Close button on notification toast is larger
 than host spot.

Close button is partially positioned out of toast(floater). Usually, hovering or clicking
that "outer" part of the button can not be handled. The workaround is to position the button
on the floater and make the floater background invisible. Now close button is properly handled,
but toast is transparent. To fix this i added wrapper_panel that looks and behaves like a floater.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_toast.xml | 34 ++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index bfe3cce7d0..11069b3ac3 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -3,17 +3,25 @@
 
 <!-- Don't remove floater's height! It is needed for Overflow and Start-Up toasts!-->
 
+<!-- 
+     This floater is invisible. To make toast look like a floater we render wrapper_panel
+     like a floater(draw shadows and so on). This is done with one purpose - make close button
+     look like it is positioned out of floater and able to accept mouse clicks (see EXT-4246)
+-->
+
 <floater
- legacy_header_height="18"
+ legacy_header_height="0"
+ header_height="0"
  name="toast"
  title=""
  visible="false"
  layout="topleft"
- height="40"  
- width="305"
+ height="47"  
+ width="310"
  left="0"
  top="0"
  follows="right|bottom"
+ background_visible="false"
  bg_opaque_image="Toast_Over"
  bg_alpha_image="Toast_Background"
  can_minimize="false"
@@ -27,6 +35,21 @@
  drop_shadow_visible = "false"
  border = "false"
 >
+ <panel
+  background_opaque="false"
+  border_visible="false"
+  background_visible="true"
+  bg_opaque_image="Toast_Over"
+  bg_alpha_image="Toast_Background"
+  label="wrapper_panel"
+  layout="topleft"
+  left="0"
+  name="wrapper_panel"
+  top="7"
+  height="40"
+  follows="all" 
+  translate="false"
+  width="305">
   <!-- Don't remove this wiget! It is needed for Overflow and Start-Up toasts!-->
   <text
     clip_partial="true" 
@@ -46,10 +69,11 @@
    width="260">
     Toast text;
   </text>
+ </panel>
   <button
     layout="topleft"
-    top="-14"
-    left="293"
+    top="0"
+    right="310"
     width="17"
     height="17"
     follows="top|right"
-- 
cgit v1.2.3