diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-10-24 14:17:15 +0200 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-10-24 14:17:15 +0200 |
| commit | 338914bd7d7e776d3ca5a4eb9a579fcbe53cf1b9 (patch) | |
| tree | f2a93b07b40d229719f491a716492f17aeb81c45 /indra/llui/lldockablefloater.cpp | |
| parent | 443d1b08b22262566dc4d476ca0bdef665518721 (diff) | |
EXP-1400 FIXED (Call request docking icon overlays other toolbar buttons when speak button in side toolbar)
- LLDockableFloater::getDockTongue to init dock tongue with proper image depending on floater dock side, also added images for left and right tongues.
- Added proper call floater positioning relatively to the speak button
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index aea58be12a..0fcd937361 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -239,8 +239,21 @@ void LLDockableFloater::setDockControl(LLDockControl* dockControl) setDocked(isDocked()); } -const LLUIImagePtr& LLDockableFloater::getDockTongue() +const LLUIImagePtr& LLDockableFloater::getDockTongue(LLDockControl::DocAt dock_side) { + switch(dock_side) + { + case LLDockControl::LEFT: + mDockTongue = LLUI::getUIImage("windows/Flyout_Left.png"); + break; + case LLDockControl::RIGHT: + mDockTongue = LLUI::getUIImage("windows/Flyout_Right.png"); + break; + default: + mDockTongue = LLUI::getUIImage("windows/Flyout_Pointer.png"); + break; + } + return mDockTongue; } |