From 49d7b58ce8617522867210e878a0e6d930503a69 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 8 Apr 2024 04:30:56 +0300 Subject: [PATCH 39/39] gtk: Use long form of wonder report when possible With the message_chat_location MERGED there's plenty of space within the report area. See RM #428 Signed-off-by: Marko Lindqvist --- client/gui-gtk-3.22/menu.c | 6 +++++- client/gui-gtk-4.0/menu.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/client/gui-gtk-3.22/menu.c b/client/gui-gtk-3.22/menu.c index 19c22dab85..4e118ed09f 100644 --- a/client/gui-gtk-3.22/menu.c +++ b/client/gui-gtk-3.22/menu.c @@ -788,7 +788,11 @@ static void report_nations_callback(GtkMenuItem *item, gpointer data) ****************************************************************************/ static void report_wow_callback(GtkMenuItem *item, gpointer data) { - send_report_request(REPORT_WONDERS_OF_THE_WORLD); + if (GUI_GTK_OPTION(message_chat_location) == GUI_GTK_MSGCHAT_MERGED) { + send_report_request(REPORT_WONDERS_OF_THE_WORLD_LONG); + } else { + send_report_request(REPORT_WONDERS_OF_THE_WORLD); + } } /************************************************************************//** diff --git a/client/gui-gtk-4.0/menu.c b/client/gui-gtk-4.0/menu.c index a5e427cb34..38eadc11f3 100644 --- a/client/gui-gtk-4.0/menu.c +++ b/client/gui-gtk-4.0/menu.c @@ -1381,7 +1381,11 @@ static void report_wow_callback(GSimpleAction *action, GVariant *parameter, gpointer data) { - send_report_request(REPORT_WONDERS_OF_THE_WORLD); + if (GUI_GTK_OPTION(message_chat_location) == GUI_GTK_MSGCHAT_MERGED) { + send_report_request(REPORT_WONDERS_OF_THE_WORLD_LONG); + } else { + send_report_request(REPORT_WONDERS_OF_THE_WORLD); + } } /************************************************************************//** -- 2.43.0