[webkit-changes] [254199] trunk/Source/WebKit

Wed, 08 Jan 2020 07:14:10 -0800

Title: [254199] trunk/Source/WebKit
Revision
254199
Author
[email protected]
Date
2020-01-08 07:13:53 -0800 (Wed, 08 Jan 2020)

Log Message

[GTK] Editing: Allow line breaks in lists
https://bugs.webkit.org/show_bug.cgi?id=205913

Patch by Milan Crha <[email protected]> on 2020-01-08
Reviewed by Carlos Garcia Campos.

* UIProcess/gtk/KeyBindingTranslator.cpp:
Treat Shift+Enter as "InsertLineBreak", instead of "InsertNewLine".

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (254198 => 254199)


--- trunk/Source/WebKit/ChangeLog	2020-01-08 14:10:07 UTC (rev 254198)
+++ trunk/Source/WebKit/ChangeLog	2020-01-08 15:13:53 UTC (rev 254199)
@@ -1,3 +1,13 @@
+2020-01-08  Milan Crha  <[email protected]>
+
+        [GTK] Editing: Allow line breaks in lists
+        https://bugs.webkit.org/show_bug.cgi?id=205913
+
+        Reviewed by Carlos Garcia Campos.
+
+        * UIProcess/gtk/KeyBindingTranslator.cpp:
+        Treat Shift+Enter as "InsertLineBreak", instead of "InsertNewLine".
+
 2020-01-08  youenn fablet  <[email protected]>
 
         Implement MediaRecorder backend in GPUProcess

Modified: trunk/Source/WebKit/UIProcess/gtk/KeyBindingTranslator.cpp (254198 => 254199)


--- trunk/Source/WebKit/UIProcess/gtk/KeyBindingTranslator.cpp	2020-01-08 14:10:07 UTC (rev 254198)
+++ trunk/Source/WebKit/UIProcess/gtk/KeyBindingTranslator.cpp	2020-01-08 15:13:53 UTC (rev 254199)
@@ -193,12 +193,18 @@
 };
 
 static const KeyCombinationEntry customKeyBindings[] = {
-    { GDK_KEY_b,         GDK_CONTROL_MASK,               "ToggleBold"    },
-    { GDK_KEY_i,         GDK_CONTROL_MASK,               "ToggleItalic"  },
-    { GDK_KEY_Escape,    0,                              "Cancel"        },
-    { GDK_KEY_greater,   GDK_CONTROL_MASK,               "Cancel"        },
-    { GDK_KEY_Tab,       0,                              "InsertTab"     },
-    { GDK_KEY_Tab,       GDK_SHIFT_MASK,                 "InsertBacktab" },
+    { GDK_KEY_b,         GDK_CONTROL_MASK, "ToggleBold"      },
+    { GDK_KEY_i,         GDK_CONTROL_MASK, "ToggleItalic"    },
+    { GDK_KEY_Escape,    0,                "Cancel"          },
+    { GDK_KEY_greater,   GDK_CONTROL_MASK, "Cancel"          },
+    { GDK_KEY_Tab,       0,                "InsertTab"       },
+    { GDK_KEY_Tab,       GDK_SHIFT_MASK,   "InsertBacktab"   },
+    { GDK_KEY_Return,    0,                "InsertNewLine"   },
+    { GDK_KEY_KP_Enter,  0,                "InsertNewLine"   },
+    { GDK_KEY_ISO_Enter, 0,                "InsertNewLine"   },
+    { GDK_KEY_Return,    GDK_SHIFT_MASK,   "InsertLineBreak" },
+    { GDK_KEY_KP_Enter,  GDK_SHIFT_MASK,   "InsertLineBreak" },
+    { GDK_KEY_ISO_Enter, GDK_SHIFT_MASK,   "InsertLineBreak" },
 };
 
 Vector<String> KeyBindingTranslator::commandsForKeyEvent(GdkEventKey* event)
@@ -214,12 +220,8 @@
     if (!m_pendingEditorCommands.isEmpty())
         return WTFMove(m_pendingEditorCommands);
 
-    // Special-case enter keys for we want them to work regardless of modifier.
-    if ((keyval == GDK_KEY_Return || keyval == GDK_KEY_KP_Enter || keyval == GDK_KEY_ISO_Enter))
-        return { "InsertNewLine" };
-
     // For keypress events, we want charCode(), but keyCode() does that.
-    unsigned mapKey = state << 16 | keyval;
+    unsigned mapKey = (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)) << 16 | keyval;
     if (!mapKey)
         return { };
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to