From d3cfb6ca36d2e4624fff626fbf8ab0ed7bc8ec59 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Tue, 18 May 2010 17:57:04 +0300
Subject: EXT-7112 fix Set map pos,bgnd and size in code to match mockup
--HG--
branch : product-engine
---
indra/newview/llfloatermap.cpp | 11 +++++++++++
indra/newview/skins/default/colors.xml | 2 +-
indra/newview/skins/default/xui/en/floater_map.xml | 8 ++++----
3 files changed, 16 insertions(+), 5 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
index 5677899dd9..725fc17136 100644
--- a/indra/newview/llfloatermap.cpp
+++ b/indra/newview/llfloatermap.cpp
@@ -232,6 +232,17 @@ void LLFloaterMap::onFocusLost()
void LLFloaterMap::reshape(S32 width, S32 height, BOOL called_from_parent)
{
LLFloater::reshape(width, height, called_from_parent);
+
+ //fix for ext-7112
+ //by default ctrl can't overlap caption area
+ if(mMap)
+ {
+ LLRect map_rect;
+ map_rect.setLeftTopAndSize( 0, getRect().getHeight(), width, height);
+ mMap->reshape( width, height, 1);
+ mMap->setRect(map_rect);
+ }
+
updateMinorDirections();
}
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 0540a03e25..33668f5ed6 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -530,7 +530,7 @@
reference="Unused?" />
<color
name="NetMapBackgroundColor"
- value="0 0 0 0" />
+ value="0 0 0 1" />
<color
name="NetMapGroupOwnAboveWater"
reference="Purple" />
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index e21e44204d..249b091800 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
bg_alpha_image_overlay="DkGray_66"
- legacy_header_height="18"
+ legacy_header_height="0"
can_minimize="true"
can_resize="true"
follows="top|right"
@@ -10,7 +10,7 @@
min_height="174"
min_width="174"
name="Map"
- title="Mini Map"
+ title=""
help_topic="map"
save_rect="true"
save_visibility="true"
@@ -62,8 +62,8 @@
mouse_opaque="false"
name="Net Map"
width="200"
- height="200"
- top="18"/>
+ height="218"
+ top="0"/>
<text
type="string"
length="1"
--
cgit v1.2.3