Ticket #13286: 0001-Bug-fix-When-both-Backgrounds-and-Screen-are-open-if.patch

new file headers/private/preferences/ScreenDefs.h

@@ +1 @@
+/*
+ * Copyright 2017, Haiku.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *      Brian Hill <supernova@warpmail.net>
+ */
+#ifndef _SCREEN_DEFS_H
+#define _SCREEN_DEFS_H
+
+
+// Message sent to Screen from Backgrounds when updating the background color
+static const uint32 UPDATE_DESKTOP_COLOR_MSG = 'udsc';
+
+#endif  // _SCREEN_DEFS_H

src/preferences/backgrounds/BackgroundsView.cpp

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Haiku, Inc. All rights reserved.
+ * Copyright 2002-2017 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -7 +7 @@
  *      Jerome Duval, jerome.duval@free.fr
  *      Jonas Sundström, jonas@kirilla.se
  *      John Scipione, jscipione@gmail.com
+ *      Brian Hill <supernova@warpmail.net>
  */
 
 
@@ -17 +18 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <Alert.h>
 #include <Bitmap.h>
 #include <Catalog.h>
 #include <ControlLook.h>
@@ -33 +35 @@
 #include <PopUpMenu.h>
 
 #include <be_apps/Tracker/Background.h>
+#include <ScreenDefs.h>
 
 #include "ImageFilePanel.h"
 
@@ -415 +418 @@
         {
             _Save();
 
-            //_NotifyServer();
+            // Notify the server and Screen preflet
             thread_id notify_thread;
             notify_thread = spawn_thread(BackgroundsView::_NotifyThread,
-                "notifyServer", B_NORMAL_PRIORITY, this);
+                "notifyThread", B_NORMAL_PRIORITY, this);
             resume_thread(notify_thread);
             _UpdateButtons();
             break;
@@ -659 +662 @@
 
     status_t status = fCurrent->SetBackgroundImage(&node);
     if (status != B_OK) {
-        // TODO: this should be a BAlert!
-        printf("setting background image failed: %s\n", strerror(status));
+        BString error(strerror(status));
+        BString text(B_TRANSLATE("Setting the background image failed:"));
+        text.Append("\n").Append(error);
+        BAlert* alert = new BAlert(B_TRANSLATE("Set background image error"),
+            text, B_TRANSLATE("OK"));
+        alert->SetShortcut(0, B_ESCAPE);
+        alert->Go(NULL);
+        printf("setting background image failed: %s\n", error.String());
     }
 }
 
@@ -743 +752 @@
 }
 
 
+void
+BackgroundsView::_NotifyScreenPreflet()
+{
+    BMessenger messenger("application/x-vnd.Haiku-Screen");
+    if (messenger.IsValid())
+        messenger.SendMessage(UPDATE_DESKTOP_COLOR_MSG);
+}
+
+
 int32
 BackgroundsView::_NotifyThread(void* data)
 {
     BackgroundsView* view = (BackgroundsView*)data;
 
     view->_NotifyServer();
+    view->_NotifyScreenPreflet();
     return B_OK;
 }
 

src/preferences/backgrounds/BackgroundsView.h

@@ -120 +120 @@
 protected:
             void                _Save();
             void                _NotifyServer();
+            void                _NotifyScreenPreflet();
             void                _LoadSettings();
             void                _LoadDesktopFolder();
             void                _LoadDefaultFolder();

src/preferences/backgrounds/Jamfile

@@ -1 +1 @@
 SubDir HAIKU_TOP src preferences backgrounds ;
 
-UsePrivateHeaders shared ;
+UsePrivateHeaders preferences shared ;
 
 Preference Backgrounds :
     BackgroundImage.cpp

src/preferences/screen/Constants.h

@@ -10 +10 @@
 #define CONSTANTS_H
 
 
+#include <ScreenDefs.h>
 #include <SupportDefs.h>
 
 
@@ -30 +31 @@
 static const uint32 POP_SWAP_DISPLAYS_MSG = 'psdi';
 static const uint32 POP_USE_LAPTOP_PANEL_MSG = 'pulp';
 static const uint32 POP_TV_STANDARD_MSG = 'ptvs';
-static const uint32 UPDATE_DESKTOP_COLOR_MSG = 'udsc';
+//static const uint32 UPDATE_DESKTOP_COLOR_MSG = 'udsc';
+    // This is now defined in headers/private/preferences/ScreenDefs.h
 static const uint32 UPDATE_DESKTOP_MSG = 'udsk';
 static const uint32 SLIDER_MODIFICATION_MSG = 'sldm';
 static const uint32 SLIDER_INVOKE_MSG = 'sldi';

src/preferences/screen/Jamfile

@@ -4 +4 @@
 
 UsePrivateHeaders [ FDirName graphics common ] ;
 UsePrivateHeaders [ FDirName graphics radeon ] ;
-UsePrivateHeaders interface ;
+UsePrivateHeaders interface preferences ;
 
 Preference Screen :
     AlertWindow.cpp

src/preferences/screen/ScreenApplication.cpp

@@ -51 +51 @@
     switch (message->what) {
         case SET_CUSTOM_REFRESH_MSG:
         case MAKE_INITIAL_MSG:
+        case UPDATE_DESKTOP_COLOR_MSG:
             fScreenWindow->PostMessage(message);
             break;
 

src/preferences/screen/ScreenWindow.cpp

@@ -1131 +1131 @@
             _UpdateActiveMode();
             break;
 
+        case UPDATE_DESKTOP_COLOR_MSG:
+            PostMessage(message, fMonitorView);
+            break;
+
         default:
             BWindow::MessageReceived(message);
     }