From 9653cbf3558df7c7318cac551e8e5d7ac8e669e2 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Wed, 10 Nov 2021 14:19:15 +0800 Subject: [PATCH] Fix invisible content in WebKit dialogs * src/xwidget.c (webkit_script_dialog_cb): Use custom label instead of dialog box title to display message. --- src/xwidget.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/xwidget.c b/src/xwidget.c index 278dc963231..4da53187068 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -1375,6 +1375,8 @@ webkit_script_dialog_cb (WebKitWebView *webview, GtkWidget *dialog; GtkWidget *entry; GtkWidget *content_area; + GtkWidget *box; + GtkWidget *label; const gchar *content; const gchar *message; gint result; @@ -1390,23 +1392,32 @@ webkit_script_dialog_cb (WebKitWebView *webview, content = webkit_script_dialog_get_message (script_dialog); if (type == WEBKIT_SCRIPT_DIALOG_ALERT) - dialog = gtk_dialog_new_with_buttons (content, GTK_WINDOW (widget), + dialog = gtk_dialog_new_with_buttons ("Alert", GTK_WINDOW (widget), GTK_DIALOG_MODAL, "Dismiss", 1, NULL); else - dialog = gtk_dialog_new_with_buttons (content, GTK_WINDOW (widget), + dialog = gtk_dialog_new_with_buttons ("Question", GTK_WINDOW (widget), GTK_DIALOG_MODAL, "OK", 0, "Cancel", 1, NULL); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); + label = gtk_label_new (content); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + gtk_container_add (GTK_CONTAINER (content_area), box); + + gtk_widget_show (box); + gtk_widget_show (label); + + gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); + if (type == WEBKIT_SCRIPT_DIALOG_PROMPT) { entry = gtk_entry_new (); message = webkit_script_dialog_prompt_get_default_text (script_dialog); - content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_widget_show (entry); gtk_entry_set_text (GTK_ENTRY (entry), message); - gtk_container_add (GTK_CONTAINER (content_area), entry); + gtk_box_pack_end (GTK_BOX (box), entry, TRUE, TRUE, 0); } result = gtk_dialog_run (GTK_DIALOG (dialog)); -- 2.39.5