Changeset 244583 in webkit

Timestamp:

Apr 24, 2019, 12:53:58 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] MiniBrowser: also set the passed bg-color when receiving arguments
​https://bugs.webkit.org/show_bug.cgi?id=197156

Reviewed by Michael Catanzaro.

The background color is only set when MiniBrowser is launched without arguments. This regressed when tabs
support was added.

• MiniBrowser/gtk/BrowserTab.c:

(browser_tab_set_background_color): Set the passed in color as web view background color.

• MiniBrowser/gtk/BrowserTab.h:
• MiniBrowser/gtk/BrowserWindow.c:

(browser_window_init): Initialize backgroundColor.
(browser_window_append_view): Call browser_tab_set_background_color().
(browser_window_set_background_color): Save the passed in color. This function should now be called before tabs
are added.

• MiniBrowser/gtk/main.c:

(main): Call browser_window_set_background_color() before creating the tabs.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/gtk/BrowserTab.c (modified) (1 diff)
• MiniBrowser/gtk/BrowserTab.h (modified) (1 diff)
• MiniBrowser/gtk/BrowserWindow.c (modified) (5 diffs)
• MiniBrowser/gtk/main.c (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-24  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] MiniBrowser: also set the passed bg-color when receiving arguments
+        https://bugs.webkit.org/show_bug.cgi?id=197156
+
+        Reviewed by Michael Catanzaro.
+
+        The background color is only set when MiniBrowser is launched without arguments. This regressed when tabs
+        support was added.
+
+        * MiniBrowser/gtk/BrowserTab.c:
+        (browser_tab_set_background_color): Set the passed in color as web view background color.
+        * MiniBrowser/gtk/BrowserTab.h:
+        * MiniBrowser/gtk/BrowserWindow.c:
+        (browser_window_init): Initialize backgroundColor.
+        (browser_window_append_view): Call browser_tab_set_background_color().
+        (browser_window_set_background_color): Save the passed in color. This function should now be called before tabs
+        are added.
+        * MiniBrowser/gtk/main.c:
+        (main): Call browser_window_set_background_color() before creating the tabs.
+
 2019-04-23  John Wilander  <wilander@apple.com>
 

trunk/Tools/MiniBrowser/gtk/BrowserTab.c

@@ -604 +604 @@
     }
 }
+
+void browser_tab_set_background_color(BrowserTab *tab, GdkRGBA *rgba)
+{
+    g_return_if_fail(BROWSER_IS_TAB(tab));
+    g_return_if_fail(rgba);
+
+    GdkRGBA viewRGBA;
+    webkit_web_view_get_background_color(tab->webView, &viewRGBA);
+    if (gdk_rgba_equal(rgba, &viewRGBA))
+        return;
+
+    webkit_web_view_set_background_color(tab->webView, rgba);
+}

trunk/Tools/MiniBrowser/gtk/BrowserTab.h

@@ -55 +55 @@
 void browser_tab_enter_fullscreen(BrowserTab*);
 void browser_tab_leave_fullscreen(BrowserTab*);
+void browser_tab_set_background_color(BrowserTab*, GdkRGBA*);
 
 G_END_DECLS

trunk/Tools/MiniBrowser/gtk/BrowserWindow.c

@@ -66 +66 @@
     guint resetEntryProgressTimeoutId;
     gchar *sessionFile;
+    GdkRGBA backgroundColor;
 };
 
@@ -918 +919 @@
     windowList = g_list_append(windowList, window);
 
+    window->backgroundColor.red = window->backgroundColor.green = window->backgroundColor.blue = 255;
+    window->backgroundColor.alpha = 1;
+
     gtk_window_set_title(GTK_WINDOW(window), defaultWindowTitle);
     gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
@@ -1156 +1160 @@
 
     GtkWidget *tab = browser_tab_new(webView);
+    if (gtk_widget_get_app_paintable(GTK_WIDGET(window)))
+        browser_tab_set_background_color(BROWSER_TAB(tab), &window->backgroundColor);
     browser_tab_add_accelerators(BROWSER_TAB(tab), window->accelGroup);
     gtk_notebook_append_page(GTK_NOTEBOOK(window->notebook), tab, browser_tab_get_title_widget(BROWSER_TAB(tab)));
@@ -1204 +1210 @@
     g_return_if_fail(rgba);
 
-    WebKitWebView *webView = browser_tab_get_web_view(window->activeTab);
-    GdkRGBA viewRGBA;
-    webkit_web_view_get_background_color(webView, &viewRGBA);
-    if (gdk_rgba_equal(rgba, &viewRGBA))
+    g_assert(!window->activeTab);
+
+    if (gdk_rgba_equal(rgba, &window->backgroundColor))
         return;
+
+    window->backgroundColor = *rgba;
 
     GdkVisual *rgbaVisual = gdk_screen_get_rgba_visual(gtk_window_get_screen(GTK_WINDOW(window)));
@@ -1216 +1223 @@
     gtk_widget_set_visual(GTK_WIDGET(window), rgbaVisual);
     gtk_widget_set_app_paintable(GTK_WIDGET(window), TRUE);
-
-    webkit_web_view_set_background_color(webView, rgba);
 }
 

trunk/Tools/MiniBrowser/gtk/main.c

@@ -590 +590 @@
         gtk_window_parse_geometry(GTK_WINDOW(mainWindow), geometry);
 
+    if (backgroundColor)
+        browser_window_set_background_color(mainWindow, backgroundColor);
+
     GtkWidget *firstTab = NULL;
     if (uriArguments) {
@@ -606 +609 @@
         firstTab = GTK_WIDGET(webView);
 
-        if (backgroundColor)
-            browser_window_set_background_color(mainWindow, backgroundColor);
-
         if (!editorMode) {
             if (sessionFile)