Merge pull request #1238 from Nivaturimika/fxflagbtn

fix flag button absorbing click events on the diplomatic message topbar stuff

src/gui/gui_diplomacy_request_topbar.hpp

@@ -88,14 +88,20 @@ class diplomatic_message_topbar_button : public button_element_base {
 
 	void button_action(sys::state& state) noexcept override;
 };
-
+class diplomatic_message_topbar_flag_button : public flag_button {
+public:
+	void button_action(sys::state& state) noexcept override;
+};
 class diplomatic_message_topbar_entry_window : public listbox_row_element_base<diplomatic_message::message> {
 public:
+	diplomatic_message_topbar_button* btn = nullptr;
 	std::unique_ptr<element_base> make_child(sys::state& state, std::string_view name, dcon::gui_def_id id) noexcept override {
         if(name == "diplomessageicon_button") {
-            return make_element_by_type<diplomatic_message_topbar_button>(state, id);
+            auto ptr = make_element_by_type<diplomatic_message_topbar_button>(state, id);
+	    btn = ptr.get();
+	    return ptr;
         } else if(name == "flag") {
-            return make_element_by_type<flag_button>(state, id);
+            return make_element_by_type<diplomatic_message_topbar_flag_button>(state, id);
         } else if(name == "messageicon_bg_overlay") {
             return make_element_by_type<image_element_base>(state, id);
         } else {
@@ -151,4 +157,12 @@ void diplomatic_message_topbar_button::button_action(sys::state& state) noexcept
 	dmtl->impl_on_update(state);
 }
 
+void diplomatic_message_topbar_flag_button::button_action(sys::state& state) noexcept {
+	if(parent) {
+		auto win = static_cast<diplomatic_message_topbar_entry_window*>(parent);
+		if(win->btn)
+			win->btn->button_action(state);
+	}
+}
+
 }