Changeset 29665 in webkit

Timestamp:

Jan 18, 2008 11:49:53 PM (16 years ago)

Author:

alp@webkit.org

Message:

2008-01-18 Luca Bruno <​lethalman88@gmail.com>

Reviewed by Alp Toker.

​http://bugs.webkit.org/show_bug.cgi?id=16910
[GTK] REGRESSION: keyboard cursor doesn't blink

​http://bugs.webkit.org/show_bug.cgi?id=16863
[GTK] REGRESSION: tab focusing doesn't work

• WebView/webkitwebview.cpp: (webkit_web_view_focus_in_event): Added. Set the active frame. (webkit_web_view_class_init):

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebView/webkitwebview.cpp (modified) (2 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2008-01-18  Luca Bruno  <lethalman88@gmail.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16910
+        [GTK] REGRESSION: keyboard cursor doesn't blink
+
+        http://bugs.webkit.org/show_bug.cgi?id=16863
+        [GTK] REGRESSION: tab focusing doesn't work
+
+        * WebView/webkitwebview.cpp:
+        (webkit_web_view_focus_in_event): Added. Set the active frame.
+        (webkit_web_view_class_init):
+
 2008-01-16  Alp Toker  <alp@atoker.com>
 

trunk/WebKit/gtk/WebView/webkitwebview.cpp

@@ -340 +340 @@
 }
 
+static gboolean webkit_web_view_focus_in_event(GtkWidget* widget, GdkEventFocus* event)
+{
+    // TODO: Improve focus handling as suggested in
+    // http://bugs.webkit.org/show_bug.cgi?id=16910
+    GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
+    if (GTK_WIDGET_TOPLEVEL(toplevel) && gtk_window_has_toplevel_focus(GTK_WINDOW(toplevel))) {
+        WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+        Frame* frame = core(webkit_web_view_get_main_frame(webView));
+        core(webView)->focusController()->setActive(frame);
+    }
+    return GTK_WIDGET_CLASS(webkit_web_view_parent_class)->focus_in_event(widget, event);
+}
+
 static void webkit_web_view_realize(GtkWidget* widget)
 {
@@ -930 +943 @@
     widgetClass->size_allocate = webkit_web_view_size_allocate;
     widgetClass->popup_menu = webkit_web_view_popup_menu_handler;
+    widgetClass->focus_in_event = webkit_web_view_focus_in_event;
 
     GtkContainerClass* containerClass = GTK_CONTAINER_CLASS(webViewClass);