diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-29 12:38:36 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-29 12:38:36 -0800 |
| commit | 8a2c92aeace76d856082b2be0ac5d299e5394a09 (patch) | |
| tree | f18f9242f3d8dad6aaefcfa94378f066dced4ba8 | |
| parent | 826071ef59325a79f1e73fe3c1160910f3fd1dfe (diff) | |
| parent | c4c727fd7a62a025d859f276a19ca4037566cfc6 (diff) | |
STORM-498 : Pull into viewer-development
| -rw-r--r-- | BuildParams | 4 | ||||
| -rw-r--r-- | indra/llui/lldockcontrol.cpp | 27 |
2 files changed, 24 insertions, 7 deletions
diff --git a/BuildParams b/BuildParams index 4cf1fa75d8..90604af8c0 100644 --- a/BuildParams +++ b/BuildParams @@ -44,8 +44,8 @@ viewer-beta.login_channel = "Second Life Beta Viewer" viewer-beta.build_debug_release_separately = true viewer-beta.build_viewer_update_version_manager = true # Settings to test new code ticket service -viewer-beta.codeticket_server_url = "http://pdp75.lindenlab.com:8000/codeticket/linden/" -viewer-beta.codeticket_add_context = true +#viewer-beta.codeticket_server_url = "http://pdp75.lindenlab.com:8000/codeticket/linden/" +#viewer-beta.codeticket_add_context = true # ======================================== # Viewer Release diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index d48674f306..f6f5a0beb3 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -220,10 +220,15 @@ void LLDockControl::moveDockable() case TOP: x = dockRect.getCenterX() - dockableRect.getWidth() / 2; y = dockRect.mTop + dockableRect.getHeight(); - // unique docking used with dock tongue, so add tongue height o the Y coordinate + // unique docking used with dock tongue, so add tongue height to the Y coordinate if (use_tongue) { y += mDockTongue->getHeight(); + + if ( y > rootRect.mTop) + { + y = rootRect.mTop; + } } // check is dockable inside root view rect @@ -257,7 +262,7 @@ void LLDockControl::moveDockable() case BOTTOM: x = dockRect.getCenterX() - dockableRect.getWidth() / 2; y = dockRect.mBottom; - // unique docking used with dock tongue, so add tongue height o the Y coordinate + // unique docking used with dock tongue, so add tongue height to the Y coordinate if (use_tongue) { y -= mDockTongue->getHeight(); @@ -292,9 +297,21 @@ void LLDockControl::moveDockable() break; } - // move dockable - dockableRect.setLeftTopAndSize(x, y, dockableRect.getWidth(), - dockableRect.getHeight()); + S32 max_available_height = rootRect.getHeight() - mDockTongueY - mDockTongue->getHeight(); + + // A floater should be shrunk so it doesn't cover a part of its docking tongue and + // there is a space between a dockable floater and a control to which it is docked. + if (use_tongue && dockableRect.getHeight() >= max_available_height) + { + dockableRect.setLeftTopAndSize(x, y, dockableRect.getWidth(), max_available_height); + mDockableFloater->reshape(dockableRect.getWidth(), dockableRect.getHeight()); + } + else + { + // move dockable + dockableRect.setLeftTopAndSize(x, y, dockableRect.getWidth(), + dockableRect.getHeight()); + } LLRect localDocableParentRect; mDockableFloater->getParent()->screenRectToLocal(dockableRect, &localDocableParentRect); |