From 530d5af4073f4dda4003005c9c117af53b84aa9d Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 4 Oct 2011 12:05:27 -0700
Subject: EXP-1204 PROGRESS -- As a User I want flexible floater management
 with no sidetray EXP-1292 FIX -- Mini-map floater can't be closed by clicking
 the sidebar button again.

* Mini-map floater text updated
* Mini-map floater behavior now acts more like other windows, has a title, etc.
---
 indra/newview/llfloatermap.cpp                     | 50 +---------------------
 indra/newview/llfloatermap.h                       |  6 ---
 indra/newview/skins/default/xui/en/floater_map.xml | 28 ++++++------
 .../skins/default/xui/en/menu_bottomtray.xml       |  2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml |  2 +-
 .../skins/default/xui/en/panel_bottomtray.xml      |  4 +-
 6 files changed, 18 insertions(+), 74 deletions(-)

diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
index 641e64247b..8713513054 100644
--- a/indra/newview/llfloatermap.cpp
+++ b/indra/newview/llfloatermap.cpp
@@ -100,16 +100,13 @@ BOOL LLFloaterMap::postBuild()
 	mTextBoxSouthWest = getChild<LLTextBox> ("floater_map_southwest");
 	mTextBoxNorthWest = getChild<LLTextBox> ("floater_map_northwest");
 
-	stretchMiniMap(getRect().getWidth() - MAP_PADDING_LEFT - MAP_PADDING_RIGHT
-		,getRect().getHeight() - MAP_PADDING_TOP - MAP_PADDING_BOTTOM);
-
 	updateMinorDirections();
 
 	// Get the drag handle all the way in back
 	sendChildToBack(getDragHandle());
 
-	setIsChrome(TRUE);
-	getDragHandle()->setTitleVisible(TRUE);
+	//setIsChrome(TRUE);
+	//getDragHandle()->setTitleVisible(TRUE);
 	
 	// keep onscreen
 	gFloaterView->adjustToFitScreen(this, FALSE);
@@ -223,40 +220,10 @@ void LLFloaterMap::draw()
 	LLFloater::draw();
 }
 
-// virtual
-void LLFloaterMap::onFocusReceived()
-{
-	setBackgroundOpaque(true);
-	LLPanel::onFocusReceived();
-}
-
-// virtual
-void LLFloaterMap::onFocusLost()
-{
-	setBackgroundOpaque(false);
-	LLPanel::onFocusLost();
-}
-
-void LLFloaterMap::stretchMiniMap(S32 width,S32 height)
-{
-	//fix for ext-7112
-	//by default ctrl can't overlap caption area
-	if(mMap)
-	{
-		LLRect map_rect;
-		map_rect.setLeftTopAndSize( MAP_PADDING_LEFT, getRect().getHeight() - MAP_PADDING_TOP, width, height);
-		mMap->reshape( width, height, 1);
-		mMap->setRect(map_rect);
-	}
-}
-
 void LLFloaterMap::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
 	LLFloater::reshape(width, height, called_from_parent);
 	
-	stretchMiniMap(width - MAP_PADDING_LEFT - MAP_PADDING_RIGHT
-		,height - MAP_PADDING_TOP - MAP_PADDING_BOTTOM);
-
 	updateMinorDirections();
 }
 
@@ -285,16 +252,3 @@ void LLFloaterMap::handleZoom(const LLSD& userdata)
 		mMap->setScale(scale);
 	}
 }
-
-void	LLFloaterMap::setMinimized(BOOL b)
-{
-	LLFloater::setMinimized(b);
-	if(b)
-	{
-		setTitle(getString("mini_map_caption"));
-	}
-	else
-	{
-		setTitle("");
-	}
-}
diff --git a/indra/newview/llfloatermap.h b/indra/newview/llfloatermap.h
index 5cf66a594b..8a1b965e62 100644
--- a/indra/newview/llfloatermap.h
+++ b/indra/newview/llfloatermap.h
@@ -45,18 +45,12 @@ public:
 	/*virtual*/ BOOL	handleDoubleClick( S32 x, S32 y, MASK mask );
 	/*virtual*/ void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	/*virtual*/ void	draw();
-	/*virtual*/ void	onFocusLost();
-	/*virtual*/ void	onFocusReceived();
 
-	/*virtual*/ void	setMinimized(BOOL b);
-	
 private:
 	void handleZoom(const LLSD& userdata);
 	void setDirectionPos( LLTextBox* text_box, F32 rotation );
 	void updateMinorDirections();
 
-	void stretchMiniMap(S32 width,S32 height);
-	
 	LLTextBox*		mTextBoxEast;
 	LLTextBox*		mTextBoxNorth;
 	LLTextBox*		mTextBoxWest;
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index ae99fa8dd5..51f63edc31 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- bg_alpha_image_overlay="DkGray_66"
- legacy_header_height="0"
  can_minimize="true" 
  can_resize="true"
  follows="top|right"
- height="174"
+ height="200"
  layout="topleft"
  min_height="128"
  min_width="128"
  name="Map"
- title=""
+ title="Mini-map"
  help_topic="map"
  save_rect="true"
  save_visibility="true"
- single_instance="true"
  left="0"
  top="0"
  width="200">
@@ -27,17 +24,16 @@
 		[REGION](Double-click to teleport, shift-drag to pan)
 	</floater.string>
 	<floater.string name="mini_map_caption">
-	MINIMAP
+	Mini-map
     </floater.string>
     <net_map
-     bg_color="NetMapBackgroundColor"
      follows="top|left|bottom|right"
      layout="topleft"
      left="0"
      mouse_opaque="false"
      name="Net Map"
      width="200"
-     height="218"
+     height="200"
      top="0"/>
     <text
      type="string"
@@ -49,7 +45,7 @@
      name="floater_map_north"
      right="10"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         N
     </text>
     <text
@@ -62,7 +58,7 @@
      name="floater_map_east"
      right="10"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         E
     </text>
     <text
@@ -75,7 +71,7 @@
      name="floater_map_west"
      right="11"
      text_color="1 1 1 0.7"
-     top="195">
+     top="175">
         W
     </text>
     <text
@@ -88,7 +84,7 @@
      name="floater_map_south"
      right="10"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         S
     </text>
     <text
@@ -101,7 +97,7 @@
      name="floater_map_southeast"
      right="20"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         SE
     </text>
     <text
@@ -114,7 +110,7 @@
      name="floater_map_northeast"
      right="20"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         NE
     </text>
     <text
@@ -127,7 +123,7 @@
      name="floater_map_southwest"
      right="20"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         SW
     </text>
     <text
@@ -140,7 +136,7 @@
      name="floater_map_northwest"
      right="20"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         NW
     </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
index 07dabe1909..1a102c21bb 100644
--- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
@@ -97,7 +97,7 @@
          parameter="ShowWorldMapButton" />
     </menu_item_check>
     <menu_item_check
-     label="Mini-Map button"
+     label="Mini-map button"
      layout="topleft"
      name="ShowMiniMapButton">
         <menu_item_check.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 733b97d827..1ba204473f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -257,7 +257,7 @@
      name="World"
      tear_off="true">
             <menu_item_check
-         label="Mini-Map"
+         label="Mini-map"
          name="Mini-Map"
          shortcut="control|shift|M">
             <menu_item_check.on_check
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index ec5853649e..2737746c0e 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -353,11 +353,11 @@ Disabled for now.
              image_pressed_selected="PushButton_Selected_Press"
              image_selected="PushButton_Selected_Press"
              is_toggle="true"
-             label="Mini-Map"
+             label="Mini-map"
              layout="topleft"
              left="0"
              name="mini_map_btn"
-             tool_tip="Shows/hides Mini-Map"
+             tool_tip="Shows/hides mini-map"
              top="5"
              use_ellipses="true"
              width="80">
-- 
cgit v1.2.3