From 6e64d5681f92c59262dcf77cc8e7066a8f985020 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Sun, 12 Apr 2026 20:40:25 -0400 Subject: [PATCH] Tracker: Tell pose view on Desktop to update its colors and replicant colors ... on B_RESTORE_BACKGROUND_IMAGE (which sets the Desktop color or wallpaper). Remove kRestoreBackgroundImage, preferring the B_ version we got from Backgrounds (and represents the same constant). Tracker already imported this constant long ago. Fixes #20028. Change-Id: I6c59f4ddd1b2a7ec0d5e90fe6a8a9671dc66d50e Reviewed-on: https://review.haiku-os.org/c/haiku/+/10729 Reviewed-by: waddlesplash Tested-by: Commit checker robot --- src/kits/tracker/BackgroundImage.h | 2 -- src/kits/tracker/ContainerWindow.cpp | 3 ++- src/kits/tracker/DeskWindow.cpp | 6 ++++++ src/kits/tracker/PoseView.cpp | 5 ----- src/kits/tracker/Tracker.cpp | 3 ++- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/kits/tracker/BackgroundImage.h b/src/kits/tracker/BackgroundImage.h index 7f2267871c..fc9b84c1ca 100644 --- a/src/kits/tracker/BackgroundImage.h +++ b/src/kits/tracker/BackgroundImage.h @@ -59,8 +59,6 @@ extern const char* kBackgroundImageInfoMode; extern const char* kBackgroundImageInfoWorkspaces; extern const char* kBackgroundImageInfoPath; -const uint32 kRestoreBackgroundImage = 'Tbgr'; - class BackgroundImage { // This class knows everything about which bitmap to use for a given // view and how. diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp index 820377a987..d750af0089 100644 --- a/src/kits/tracker/ContainerWindow.cpp +++ b/src/kits/tracker/ContainerWindow.cpp @@ -67,6 +67,7 @@ All rights reserved. #include "Attributes.h" #include "AutoDeleter.h" #include "AutoLock.h" +#include "Background.h" #include "BackgroundImage.h" #include "Commands.h" #include "CountView.h" @@ -1503,7 +1504,7 @@ BContainerWindow::MessageReceived(BMessage* message) be_app->PostMessage(B_QUIT_REQUESTED); break; - case kRestoreBackgroundImage: + case B_RESTORE_BACKGROUND_IMAGE: UpdateBackgroundImage(); break; diff --git a/src/kits/tracker/DeskWindow.cpp b/src/kits/tracker/DeskWindow.cpp index 0d7da56c14..e6357e432c 100644 --- a/src/kits/tracker/DeskWindow.cpp +++ b/src/kits/tracker/DeskWindow.cpp @@ -58,6 +58,7 @@ All rights reserved. #include "Attributes.h" #include "AutoLock.h" +#include "Background.h" #include "BackgroundImage.h" #include "Commands.h" #include "FSUtils.h" @@ -594,6 +595,11 @@ BDeskWindow::MessageReceived(BMessage* message) break; } + case B_RESTORE_BACKGROUND_IMAGE: + UpdateBackgroundImage(); + PoseView()->MessageReceived(message); + break; + default: _inherited::MessageReceived(message); break; diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp index e52b995494..aa0356742e 100644 --- a/src/kits/tracker/PoseView.cpp +++ b/src/kits/tracker/PoseView.cpp @@ -2240,11 +2240,6 @@ BPoseView::MessageReceived(BMessage* message) AddPosesCompleted(); break; - case kRestoreBackgroundImage: - if (ContainerWindow() != NULL) - ContainerWindow()->MessageReceived(message); - break; - case B_META_MIME_CHANGED: NoticeMetaMimeChanged(message); break; diff --git a/src/kits/tracker/Tracker.cpp b/src/kits/tracker/Tracker.cpp index 0c2c27292a..a67c68d1f7 100644 --- a/src/kits/tracker/Tracker.cpp +++ b/src/kits/tracker/Tracker.cpp @@ -63,6 +63,7 @@ All rights reserved. #include "Attributes.h" #include "AutoLock.h" +#include "Background.h" #include "BackgroundImage.h" #include "Bitmaps.h" #include "Commands.h" @@ -536,7 +537,7 @@ TTracker::MessageReceived(BMessage* message) MountServer().SendMessage(message); break; - case kRestoreBackgroundImage: + case B_RESTORE_BACKGROUND_IMAGE: { BDeskWindow* desktop = GetDeskWindow(); AutoLock lock(desktop);