From 3650ef0d9ff937aeb1081817158021adb3f081d2 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Mon, 1 Feb 2010 16:30:48 +0200
Subject: fix for normal EXT-4512 [BSI] Can't minimize Mini-Map actually this
 has nothing with original bug description so...fix map and text pos on map
 resize

--HG--
branch : product-engine
---
 indra/newview/llfloatermap.cpp                     |  4 +--
 indra/newview/skins/default/xui/en/floater_map.xml | 40 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
index 568f4b254e..051ab585e2 100644
--- a/indra/newview/llfloatermap.cpp
+++ b/indra/newview/llfloatermap.cpp
@@ -142,8 +142,8 @@ void LLFloaterMap::setDirectionPos( LLTextBox* text_box, F32 rotation )
 	// Rotation is in radians.
 	// Rotation of 0 means x = 1, y = 0 on the unit circle.
 
-	F32 map_half_height = (F32)(getRect().getHeight() / 2);
-	F32 map_half_width = (F32)(getRect().getWidth() / 2);
+	F32 map_half_height = (F32)(getRect().getHeight() / 2) - getHeaderHeight()/2;
+	F32 map_half_width = (F32)(getRect().getWidth() / 2) ;
 	F32 text_half_height = (F32)(text_box->getRect().getHeight() / 2);
 	F32 text_half_width = (F32)(text_box->getRect().getWidth() / 2);
 	F32 radius = llmin( map_half_height - text_half_height, map_half_width - text_half_width );
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index 3ddb7bc349..1903e7c714 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -6,7 +6,7 @@
  center_horiz="true"
  center_vert="true"
  follows="top|right"
- height="225"
+ height="218"
  layout="topleft"
  min_height="60"
  min_width="174"
@@ -55,116 +55,116 @@
     </floater.string>
     <net_map
      bg_color="NetMapBackgroundColor"
-     bottom="225"
      follows="top|left|bottom|right"
      layout="topleft"
      left="0"
      mouse_opaque="false"
      name="Net Map"
-     right="198"
-     top="2" />
+     width="200"
+     height="200"
+     top="18"/>
     <text
      type="string"
      length="1"
-     bottom="225"
+     bottom="218"
      label="N"
      layout="topleft"
      left="0"
      name="floater_map_north"
      right="10"
      text_color="1 1 1 0.7"
-     top="215">
+     top="209">
         N
     </text>
     <text
      type="string"
      length="1"
-     bottom="225"
+     bottom="218"
      label="E"
      layout="topleft"
      left="0"
      name="floater_map_east"
      right="10"
      text_color="1 1 1 0.7"
-     top="215">
+     top="209">
         E
     </text>
     <text
      type="string"
      length="1"
-     bottom="225"
+     bottom="205"
      label="W"
      layout="topleft"
      left="0"
      name="floater_map_west"
      right="11"
      text_color="1 1 1 0.7"
-     top="215">
+     top="195">
         W
     </text>
     <text
      type="string"
      length="1"
-     bottom="225"
+     bottom="218"
      label="S"
      layout="topleft"
      left="0"
      name="floater_map_south"
      right="10"
      text_color="1 1 1 0.7"
-     top="215">
+     top="209">
         S
     </text>
     <text
      type="string"
      length="1"
-     bottom="225"
+     bottom="218"
      label="SE"
      layout="topleft"
      left="0"
      name="floater_map_southeast"
      right="20"
      text_color="1 1 1 0.7"
-     top="215">
+     top="209">
         SE
     </text>
     <text
      type="string"
      length="1"
-     bottom="225"
+     bottom="218"
      label="NE"
      layout="topleft"
      left="0"
      name="floater_map_northeast"
      right="20"
      text_color="1 1 1 0.7"
-     top="215">
+     top="209">
         NE
     </text>
     <text
      type="string"
      length="1"
-     bottom="225"
+     bottom="218"
      label="SW"
      layout="topleft"
      left="0"
      name="floater_map_southwest"
      right="20"
      text_color="1 1 1 0.7"
-     top="215">
+     top="209">
         SW
     </text>
     <text
      type="string"
      length="1"
-     bottom="225"
+     bottom="218"
      label="NW"
      layout="topleft"
      left="0"
      name="floater_map_northwest"
      right="20"
      text_color="1 1 1 0.7"
-     top="215">
+     top="209">
         NW
     </text>
 </floater>
-- 
cgit v1.2.3