[gnome-builder] plugins/c-pack: don't swallow accelerators for indentation



commit 5ce3d7e8519a6f8e5ed79aeb818b208317e18fb3
Author: Christian Hergert <chergert redhat com>
Date:   Tue Sep 6 17:37:59 2022 -0700

    plugins/c-pack: don't swallow accelerators for indentation

 src/plugins/c-pack/ide-c-indenter.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/plugins/c-pack/ide-c-indenter.c b/src/plugins/c-pack/ide-c-indenter.c
index dfa236271..4bf812668 100644
--- a/src/plugins/c-pack/ide-c-indenter.c
+++ b/src/plugins/c-pack/ide-c-indenter.c
@@ -1352,6 +1352,7 @@ ide_c_indenter_is_trigger (GtkSourceIndenter *indenter,
                            guint              keyval)
 {
   IdeCIndenter *c = (IdeCIndenter *)indenter;
+  gboolean maybe_accel = (state & (GDK_CONTROL_MASK|GDK_ALT_MASK)) != 0;
 
   switch (keyval)
     {
@@ -1364,27 +1365,27 @@ ide_c_indenter_is_trigger (GtkSourceIndenter *indenter,
 
     case GDK_KEY_braceleft:
       c->indent_action = IDE_C_INDENT_ACTION_UNINDENT_OPENING_BRACE;
-      return TRUE;
+      return !maybe_accel;
 
     case GDK_KEY_braceright:
       c->indent_action = IDE_C_INDENT_ACTION_UNINDENT_CLOSING_BRACE;
-      return TRUE;
+      return !maybe_accel;
 
     case GDK_KEY_colon:
       c->indent_action = IDE_C_INDENT_ACTION_UNINDENT_CASE_OR_LABEL;
-      return TRUE;
+      return !maybe_accel;
 
     case GDK_KEY_numbersign:
       c->indent_action = IDE_C_INDENT_ACTION_UNINDENT_HASH;
-      return TRUE;
+      return !maybe_accel;
 
     case GDK_KEY_parenright:
       c->indent_action = IDE_C_INDENT_ACTION_ALIGN_PARAMETERS;
-      return TRUE;
+      return !maybe_accel;
 
     case GDK_KEY_slash:
       c->indent_action = IDE_C_INDENT_ACTION_CLOSE_COMMENT;
-      return TRUE;
+      return !maybe_accel;
 
     default:
       return FALSE;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]