From 256c25bd25e7431f8e7452a9473a836b271d0106 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 8 Jun 2016 17:12:21 +0300 Subject: MAINT-85 Using mouse scroll while renaming item moves it out of My Inventory tab --- indra/llui/llfolderview.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/llui/llfolderview.cpp') diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 8166ef6a07..3c79d0a1d5 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -684,6 +684,12 @@ void LLFolderView::draw() } } + if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().contains(mRenamer->getRect())) + { + // renamer is not connected to the item we are renaming in any form so manage it manually + closeRenamer(); + } + // skip over LLFolderViewFolder::draw since we don't want the folder icon, label, // and arrow for the root folder LLView::draw(); -- cgit v1.2.3 From 3fe660d4555b54e3e90c1d5721c621c63f17e60b Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 9 Jun 2016 21:11:24 +0300 Subject: MAINT-85 changes should not be lost --- indra/llui/llfolderview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llui/llfolderview.cpp') diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 3c79d0a1d5..89fef2a7c3 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -687,7 +687,7 @@ void LLFolderView::draw() if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().contains(mRenamer->getRect())) { // renamer is not connected to the item we are renaming in any form so manage it manually - closeRenamer(); + finishRenamingItem(); } // skip over LLFolderViewFolder::draw since we don't want the folder icon, label, -- cgit v1.2.3 From aff8dcea758b4f31e320fb02369df97498e10c8b Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 16 Jun 2016 20:46:53 +0300 Subject: MAINT-85 Using mouse scroll while renaming item moves it out of My Inventory tab --- indra/llui/llfolderview.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llui/llfolderview.cpp') diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 89fef2a7c3..f9664e0658 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -684,9 +684,10 @@ void LLFolderView::draw() } } - if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().contains(mRenamer->getRect())) + if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().overlaps(mRenamer->getRect())) { // renamer is not connected to the item we are renaming in any form so manage it manually + // TODO: consider stopping on any scroll action instead of when out of visible area finishRenamingItem(); } -- cgit v1.2.3