Skip to content
Snippets Groups Projects
Commit 4d8338ff authored by Paul Guslisty's avatar Paul Guslisty
Browse files

Fixen normal EXT-6434 (Mini Map does not go transparent when not in focus)

- Set background opaque of the floater depending on focus and made map's background color transparent

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/99/

--HG--
branch : product-engine
parent 5fbcc249
No related branches found
No related tags found
No related merge requests found
...@@ -215,6 +215,20 @@ void LLFloaterMap::draw() ...@@ -215,6 +215,20 @@ void LLFloaterMap::draw()
LLFloater::draw(); LLFloater::draw();
} }
// virtual
void LLFloaterMap::onFocusReceived()
{
setBackgroundOpaque(true);
LLPanel::onFocusReceived();
}
// virtual
void LLFloaterMap::onFocusLost()
{
setBackgroundOpaque(false);
LLPanel::onFocusLost();
}
void LLFloaterMap::reshape(S32 width, S32 height, BOOL called_from_parent) void LLFloaterMap::reshape(S32 width, S32 height, BOOL called_from_parent)
{ {
LLFloater::reshape(width, height, called_from_parent); LLFloater::reshape(width, height, called_from_parent);
......
...@@ -53,6 +53,8 @@ class LLFloaterMap : public LLFloater ...@@ -53,6 +53,8 @@ class LLFloaterMap : public LLFloater
/*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask ); /*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
/*virtual*/ void draw(); /*virtual*/ void draw();
/*virtual*/ void onFocusLost();
/*virtual*/ void onFocusReceived();
private: private:
void handleZoom(const LLSD& userdata); void handleZoom(const LLSD& userdata);
......
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
reference="Unused?" /> reference="Unused?" />
<color <color
name="NetMapBackgroundColor" name="NetMapBackgroundColor"
value="0 0 0 0.3" /> value="0 0 0 0" />
<color <color
name="NetMapGroupOwnAboveWater" name="NetMapGroupOwnAboveWater"
reference="Purple" /> reference="Purple" />
......
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater <floater
bg_alpha_image_overlay="DkGray_66"
legacy_header_height="18" legacy_header_height="18"
can_minimize="true" can_minimize="true"
can_resize="true" can_resize="true"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment