Changeset 241515 in webkit

Timestamp:

Feb 14, 2019 2:11:11 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Use a scrolled window for script alerts text
​https://bugs.webkit.org/show_bug.cgi?id=184875

Reviewed by Michael Catanzaro.

To ensure long text doesn't make the dialog bigger.

• UIProcess/API/gtk/WebKitScriptDialogImpl.cpp:

(webkitScriptDialogImplConstructed): Use PANGO_ELLIPSIZE_END for the title and add a scrolled window for the body.
(webkitScriptDialogImplSetText): Helper function to set the dialog body, ensuring the scrolled window fills the
dialog available size.
(webkitScriptDialogImplNew): It now receives the maximum size and uses webkitScriptDialogImplSetText().

• UIProcess/API/gtk/WebKitScriptDialogImpl.h:
• UIProcess/API/gtk/WebKitWebViewGtk.cpp:

(webkitWebViewScriptDialog): Pass the 80% of the web view size as the maximum size of script dialogs.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitScriptDialogImpl.cpp (modified) (9 diffs)
• UIProcess/API/gtk/WebKitScriptDialogImpl.h (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewGtk.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-13  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Use a scrolled window for script alerts text
+        https://bugs.webkit.org/show_bug.cgi?id=184875
+
+        Reviewed by Michael Catanzaro.
+
+        To ensure long text doesn't make the dialog bigger.
+
+        * UIProcess/API/gtk/WebKitScriptDialogImpl.cpp:
+        (webkitScriptDialogImplConstructed): Use PANGO_ELLIPSIZE_END for the title and add a scrolled window for the body.
+        (webkitScriptDialogImplSetText): Helper function to set the dialog body, ensuring the scrolled window fills the
+        dialog available size.
+        (webkitScriptDialogImplNew): It now receives the maximum size and uses webkitScriptDialogImplSetText().
+        * UIProcess/API/gtk/WebKitScriptDialogImpl.h:
+        * UIProcess/API/gtk/WebKitWebViewGtk.cpp:
+        (webkitWebViewScriptDialog): Pass the 80% of the web view size as the maximum size of script dialogs.
+
 2019-02-13  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/gtk/WebKitScriptDialogImpl.cpp

@@ -29 +29 @@
     WebKitScriptDialog* dialog;
     GtkWidget* vbox;
+    GtkWidget* swindow;
     GtkWidget* title;
     GtkWidget* label;
@@ -89 +90 @@
     gtk_widget_set_size_request(box, -1, 16);
     priv->title = gtk_label_new(nullptr);
+    gtk_label_set_ellipsize(GTK_LABEL(priv->title), PANGO_ELLIPSIZE_END);
     gtk_widget_set_margin_top(priv->title, 6);
     gtk_widget_set_margin_bottom(priv->title, 6);
@@ -107 +109 @@
     gtk_widget_show(messageArea);
 
+    priv->swindow = gtk_scrolled_window_new(nullptr, nullptr);
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(priv->swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+    gtk_box_pack_start(GTK_BOX(messageArea), priv->swindow, TRUE, TRUE, 0);
+    gtk_widget_show(priv->swindow);
+
     priv->label = gtk_label_new(nullptr);
     gtk_widget_set_halign(priv->label, GTK_ALIGN_CENTER);
@@ -112 +119 @@
     gtk_label_set_line_wrap(GTK_LABEL(priv->label), TRUE);
     gtk_label_set_max_width_chars(GTK_LABEL(priv->label), 60);
-    gtk_box_pack_start(GTK_BOX(messageArea), priv->label, TRUE, FALSE, 0);
+    gtk_container_add(GTK_CONTAINER(priv->swindow), priv->label);
     gtk_widget_show(priv->label);
 
@@ -152 +159 @@
 }
 
+static void webkitScriptDialogImplSetText(WebKitScriptDialogImpl* dialog, const char* text, GtkRequisition* maxSize)
+{
+    WebKitScriptDialogImplPrivate* priv = dialog->priv;
+    gtk_label_set_text(GTK_LABEL(priv->label), text);
+    GtkRequisition naturalRequisition;
+    gtk_widget_get_preferred_size(priv->label, nullptr, &naturalRequisition);
+    gtk_widget_set_size_request(priv->swindow, std::min(naturalRequisition.width, maxSize->width), std::min(maxSize->height, naturalRequisition.height));
+}
+
 static GtkWidget* webkitScriptDialogImplAddButton(WebKitScriptDialogImpl* dialog, const char* text)
 {
@@ -167 +183 @@
 }
 
-GtkWidget* webkitScriptDialogImplNew(WebKitScriptDialog* scriptDialog, const char* title)
+GtkWidget* webkitScriptDialogImplNew(WebKitScriptDialog* scriptDialog, const char* title, GtkRequisition* maxSize)
 {
     auto* dialog = WEBKIT_SCRIPT_DIALOG_IMPL(g_object_new(WEBKIT_TYPE_SCRIPT_DIALOG_IMPL, nullptr));
@@ -180 +196 @@
         dialog->priv->defaultButton = button;
         g_signal_connect_swapped(button, "clicked", G_CALLBACK(webkitScriptDialogImplCancel), dialog);
-        gtk_label_set_text(GTK_LABEL(dialog->priv->label), scriptDialog->message.data());
+        webkitScriptDialogImplSetText(dialog, scriptDialog->message.data(), maxSize);
         break;
     }
@@ -199 +215 @@
         dialog->priv->defaultButton = button;
         g_signal_connect_swapped(button, "clicked", G_CALLBACK(webkitScriptDialogImplConfirm), dialog);
-        gtk_label_set_text(GTK_LABEL(dialog->priv->label), scriptDialog->message.data());
+        webkitScriptDialogImplSetText(dialog, scriptDialog->message.data(), maxSize);
         break;
     }
@@ -210 +226 @@
         dialog->priv->defaultButton = button;
         g_signal_connect_swapped(button, "clicked", G_CALLBACK(webkitScriptDialogImplConfirm), dialog);
-        gtk_label_set_text(GTK_LABEL(dialog->priv->label), scriptDialog->message.data());
+        webkitScriptDialogImplSetText(dialog, scriptDialog->message.data(), maxSize);
         break;
     }

trunk/Source/WebKit/UIProcess/API/gtk/WebKitScriptDialogImpl.h

@@ -48 +48 @@
 
 GType webkit_script_dialog_impl_get_type();
-GtkWidget* webkitScriptDialogImplNew(WebKitScriptDialog*, const char* title);
+GtkWidget* webkitScriptDialogImplNew(WebKitScriptDialog*, const char* title, GtkRequisition* maxSize);
 void webkitScriptDialogImplCancel(WebKitScriptDialogImpl*);
 void webkitScriptDialogImplConfirm(WebKitScriptDialogImpl*);

trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewGtk.cpp

@@ -42 +42 @@
 {
     GUniquePtr<char> title(g_strdup_printf("JavaScript - %s", webkitWebViewGetPage(webView).pageLoadState().url().utf8().data()));
-    webkitWebViewBaseAddDialog(WEBKIT_WEB_VIEW_BASE(webView), webkitScriptDialogImplNew(scriptDialog, title.get()));
+    // Limit script dialog size to 80% of the web view size.
+    GtkRequisition maxSize = { static_cast<int>(gtk_widget_get_allocated_width(GTK_WIDGET(webView)) * 0.80), static_cast<int>(gtk_widget_get_allocated_height(GTK_WIDGET(webView)) * 0.80) };
+    webkitWebViewBaseAddDialog(WEBKIT_WEB_VIEW_BASE(webView), webkitScriptDialogImplNew(scriptDialog, title.get(), &maxSize));
 
     return TRUE;