Changeset 28388 in webkit

Timestamp:

Dec 4, 2007 6:12:16 AM (16 years ago)

Author:

alp@webkit.org

Message:

2007-12-04 Luca Bruno <​lethalman88@gmail.com>

Reviewed by Alp Toker.

Fix a regression in key press propagation in r28386.

Fix indentation (was off by two spaces).

• WebView/webkitwebview.cpp:

Location:

trunk/WebKit/gtk

Files:

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

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2007-12-04  Luca Bruno  <lethalman88@gmail.com>
+
+        Reviewed by Alp Toker.
+
+        Fix a regression in key press propagation in r28386.
+
+        Fix indentation (was off by two spaces).
+
+        * WebView/webkitwebview.cpp:
+
 2007-12-04  Luca Bruno  <lethalman88@gmail.com>
 

trunk/WebKit/gtk/WebView/webkitwebview.cpp

@@ -109 +109 @@
     PlatformKeyboardEvent keyboardEvent(event);
 
-    if (!frame->eventHandler()->keyEvent(keyboardEvent) && event->type == GDK_KEY_PRESS)
-      {
-          FrameView* view = frame->view();
-
-          /* FIXME: at the very least we should be using the same code than the
-             Windows port here, but our ScrollView file diverges enough to make
-             that impossible. A short term solution would be to unify ScrollViewWin
-             and ScrollViewGtk. Long-term ScrollView and FrameView should be
-             unified and used everywhere for scrollbars */
-
-          switch (event->keyval) {
-          case GDK_Down:
-              view->scrollBy(0, LINE_STEP);
-              return TRUE;
-          case GDK_Up:
-              view->scrollBy(0, -LINE_STEP);
-              return TRUE;
-          case GDK_Right:
-              view->scrollBy(LINE_STEP, 0);
-              return TRUE;
-          case GDK_Left:
-              view->scrollBy(-LINE_STEP, 0);
-              return TRUE;
-          }
-      }
+    if (frame->eventHandler()->keyEvent(keyboardEvent))
+        return TRUE;
+
+    if (event->type == GDK_KEY_PRESS) {
+        FrameView* view = frame->view();
+
+        /* FIXME: at the very least we should be using the same code than the
+           Windows port here, but our ScrollView file diverges enough to make
+           that impossible. A short term solution would be to unify ScrollViewWin
+           and ScrollViewGtk. Long-term ScrollView and FrameView should be
+           unified and used everywhere for scrollbars */
+
+        switch (event->keyval) {
+        case GDK_Down:
+            view->scrollBy(0, LINE_STEP);
+            return TRUE;
+        case GDK_Up:
+            view->scrollBy(0, -LINE_STEP);
+            return TRUE;
+        case GDK_Right:
+            view->scrollBy(LINE_STEP, 0);
+            return TRUE;
+        case GDK_Left:
+            view->scrollBy(-LINE_STEP, 0);
+            return TRUE;
+        }
+    }
 
     return gtk_bindings_activate_event(GTK_OBJECT(widget), event);