Message preview archiving enhancements (CB #4735 / GH #6372)

Co-authored-by: Benedikt Straub <nordfriese@noreply.codeberg.org>
Co-committed-by: Benedikt Straub <nordfriese@noreply.codeberg.org>

src/wui/info_panel.cc

@@ -26,6 +26,7 @@
 #include "graphic/font_handler.h"
 #include "graphic/text_layout.h"
 #include "logic/message_queue.h"
+#include "logic/playercommand.h"
 #include "wlapplication_options.h"
 #include "wui/interactive_player.h"
 #include "wui/toolbar.h"
@@ -62,7 +63,8 @@ MessagePreview::MessagePreview(InfoPanel* i, const Widelands::Message* m, Widela
 
 inline bool MessagePreview::message_still_exists() const {
 	return !(id_.operator bool()) || (owner_.message_queue_ == nullptr) ||
-	       (owner_.message_queue_->count(id_.value()) != 0u);
+	       (owner_.message_queue_->count(id_.value()) != 0u &&
+	        message_->status() != Widelands::Message::Status::kArchived);
 }
 
 void MessagePreview::think() {
@@ -112,7 +114,11 @@ bool MessagePreview::handle_mousepress(const uint8_t button, int32_t /* x */, in
 			   message_->position(), MapView::Transition::Smooth);
 		}
 		break;
-	case SDL_BUTTON_MIDDLE:  // hide message
+	case SDL_BUTTON_MIDDLE:  // hide and delete message
+		if (owner_.iplayer_ != nullptr && message_ != nullptr) {
+			owner_.iplayer_->game().send_player_command(new Widelands::CmdMessageSetStatusArchived(
+			   owner_.iplayer_->game().get_gametime(), owner_.iplayer_->player_number(), id_));
+		}
 		owner_.pop_message(this);
 		break;
 	case SDL_BUTTON_RIGHT: {  // open message menu