From 755b4a3a6dc6c158f7cfcd6ab8d88b38d3b79fb4 Mon Sep 17 00:00:00 2001 From: ruslantproductengine Date: Thu, 8 Nov 2018 18:33:42 +0200 Subject: =?UTF-8?q?SL-10019=20-=20[Mac]=20[Render]=20Right-click=20context?= =?UTF-8?q?=20menu=20immediately=20disappears=20when=20clicking=20any=20pl?= =?UTF-8?q?ace=20in=20the=20=E2=80=98Inventory=E2=80=99=20floater?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indra/llui/llmenugl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 0d42f726fa..752d4a27e6 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -3260,7 +3260,8 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y) menu->arrangeAndClear(); LLUI::getMousePositionLocal(menu->getParent(), &mouse_x, &mouse_y); - LLMenuHolderGL::sContextMenuSpawnPos.set(mouse_x,mouse_y); + F32 dev_scale_factor = LLView::getWindow()->getDeviceScaleFactor(); + LLMenuHolderGL::sContextMenuSpawnPos.set(mouse_x/dev_scale_factor, mouse_y/dev_scale_factor); const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getRect(); -- cgit v1.2.3