Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 07:18:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tracker: Close duplicate windows switching back to spatial mode

Browse Source 
Change-Id: Ib48b0b88651ced131d4e3081215792878b5ba837
Reviewed-on: https://review.haiku-os.org/c/haiku/+/8370
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
Haiku-Format: Haiku-format Bot <no-reply+haikuformatbot@haiku-os.org>
This commit is contained in:
John Scipione 2024-09-23 03:48:06 -04:00 committed by waddlesplash
parent a4a5800e5f
commit b6eb4ec4ab
1 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/kits/tracker/ContainerWindow.cpp
View File

@ -124,6 +124,21 @@ LockingList<AddOnShortcut>* BContainerWindow::fAddOnsList
namespace BPrivate {
int
CompareContainerWindowNodeRef(const BContainerWindow* item1, const BContainerWindow* item2)
{
const node_ref* ref1 = item1->TargetModel()->NodeRef();
const node_ref* ref2 = item2->TargetModel()->NodeRef();
if (*ref1 < *ref2)
return -1;
else if (*ref1 == *ref2)
return 0;
else
return 1;
}
filter_result
ActivateWindowFilter(BMessage*, BHandler** target, BMessageFilter*)
{
@ -141,6 +156,7 @@ ActivateWindowFilter(BMessage*, BHandler** target, BMessageFilter*)
return B_DISPATCH_MESSAGE;
}
} // namespace BPrivate
@ -1541,6 +1557,12 @@ BContainerWindow::MessageReceived(BMessage* message)
if (settings.SingleWindowBrowse() && Navigator() == NULL
&& TargetModel()->IsDirectory() && !PoseView()->IsFilePanel()
&& !PoseView()->IsDesktop()) {
SetSingleWindowBrowseShortcuts(settings.SingleWindowBrowse());
break;
}
if (settings.SingleWindowBrowse() && Navigator() == NULL
&& TargetModel()->IsDirectory()) {
fNavigator = new BNavigator(TargetModel());
fPoseContainer->GridLayout()->AddView(fNavigator, 0, 0, 2);
fNavigator->Hide();
@ -1548,9 +1570,45 @@ BContainerWindow::MessageReceived(BMessage* message)
|| settings.ShowFullPathInTitleBar());
}
if (!settings.SingleWindowBrowse() && !PoseView()->IsDesktop()
&& TargetModel()->IsDesktop()) {
// Close the "Desktop" window, but not the Desktop
if (!settings.SingleWindowBrowse() && fWindowList != NULL) {
// close duplicate windows
int32 windowCount = fWindowList->CountItems();
BObjectList<BContainerWindow> containerList(windowCount);
for (int32 index = 0; index < windowCount; index++) {
BContainerWindow* window
= dynamic_cast<BContainerWindow*>(fWindowList->ItemAt(index));
if (window != NULL && window->TargetModel() != NULL
&& window->TargetModel()->NodeRef() != NULL) {
containerList.AddItem(window);
}
}
windowCount = containerList.CountItems();
// get the window count again as it may have changed
if (windowCount > 1) {
// sort containerList by node ref
containerList.SortItems(CompareContainerWindowNodeRef);
// go backwards from second to last item to first
for (int32 index = windowCount - 2; index >= 0; --index) {
BContainerWindow* window = containerList.ItemAt(index);
BContainerWindow* second = containerList.ItemAt(index + 1);
if (window == NULL || second == NULL)
continue;
const node_ref* windowRef = window->TargetModel()->NodeRef();
const node_ref* secondRef = second->TargetModel()->NodeRef();
if (*windowRef == *secondRef) {
// duplicate windows found, close second window
// use BMessenger::SendMessage(), safer than PostMessage()
BMessenger(second).SendMessage(B_QUIT_REQUESTED);
}
}
}
}
if (!settings.SingleWindowBrowse() && TargetModel()->IsDesktop()) {
// close the "Desktop" window, but not the Desktop
this->Quit();
}