From b44496495218ab6d005a065625dd5232af4869ce Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 30 Oct 2009 11:37:16 -0700 Subject: EXT-1962 Back button drop down menu now aligns to button. LLNavigationBar was passing coordinates to LLMenuGL::showPopup() in the wrong coordinate frame. Added comments to LLMenuGL to clarify which coordinate frame to use. Not reviewed. --- indra/llui/llmenugl.cpp | 4 ++-- indra/llui/llmenugl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llui') diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 6e058e4c62..91e7e46195 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -2894,8 +2894,8 @@ void hide_top_view( LLView* view ) } -// x and y are the desired location for the popup, NOT necessarily the -// mouse location +// x and y are the desired location for the popup, in the spawning_view's +// coordinate frame, NOT necessarily the mouse location // static void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y) { diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 48887ec352..09d9e407c7 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -505,7 +505,7 @@ public: void buildDrawLabels(); void createJumpKeys(); - // Show popup at a specific location. + // Show popup at a specific location, in the spawn_view's coordinate frame static void showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y); // Whether to drop shadow menu bar -- cgit v1.2.3