Skip to content

Commit

Permalink
Keyboard shortcut fixes
Browse files Browse the repository at this point in the history
Fix keyboard shortcuts without the shift key, switch tab mappings and update split tab vertical keybind default to new keybinding code.
  • Loading branch information
Davidy22 committed Oct 20, 2021
1 parent cbace11 commit 4b40cc0
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion guake/data/org.guake.gschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@
<description>Switch to the last tab.</description>
</key>
<key name="split-tab-vertical" type="s">
<default>'&lt;Super&gt;less'</default>
<default>'&lt;Super&gt;comma'</default>
<summary>Split tab vertical.</summary>
<description>Split tab vertical.</description>
</key>
Expand Down
24 changes: 12 additions & 12 deletions guake/keybindings.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ def x(*args):
("search-on-web", self.guake.search_on_web),
("move-tab-left", self.guake.accel_move_tab_left),
("move-tab-right", self.guake.accel_move_tab_right),
("switch-tab1", self.guake.gen_accel_switch_tabN(1)),
("switch-tab2", self.guake.gen_accel_switch_tabN(2)),
("switch-tab3", self.guake.gen_accel_switch_tabN(3)),
("switch-tab4", self.guake.gen_accel_switch_tabN(4)),
("switch-tab5", self.guake.gen_accel_switch_tabN(5)),
("switch-tab6", self.guake.gen_accel_switch_tabN(6)),
("switch-tab7", self.guake.gen_accel_switch_tabN(7)),
("switch-tab8", self.guake.gen_accel_switch_tabN(8)),
("switch-tab9", self.guake.gen_accel_switch_tabN(9)),
("switch-tab10", self.guake.gen_accel_switch_tabN(10)),
("switch-tab1", self.guake.gen_accel_switch_tabN(0)),
("switch-tab2", self.guake.gen_accel_switch_tabN(1)),
("switch-tab3", self.guake.gen_accel_switch_tabN(2)),
("switch-tab4", self.guake.gen_accel_switch_tabN(3)),
("switch-tab5", self.guake.gen_accel_switch_tabN(4)),
("switch-tab6", self.guake.gen_accel_switch_tabN(5)),
("switch-tab7", self.guake.gen_accel_switch_tabN(6)),
("switch-tab8", self.guake.gen_accel_switch_tabN(7)),
("switch-tab9", self.guake.gen_accel_switch_tabN(8)),
("switch-tab10", self.guake.gen_accel_switch_tabN(9)),
("switch-tab-last", self.guake.accel_switch_tab_last),
("reset-terminal", self.guake.accel_reset_terminal),
(
Expand Down Expand Up @@ -239,8 +239,8 @@ def activate(self, window, event):
key = Gdk.keyval_to_lower(key)
else:
keys = Gdk.keyval_convert_case(key)
if keys[0] != keys[1]:
key = keys[1]
if key != keys[1]:
key = keys[0]
mod &= ~Gdk.ModifierType.SHIFT_MASK

mask = mod & self._masks
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/keybinding_fixes-51d91ab3004cdfa3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
release_summary: >
Fix keybinding regressions
fixes:
- |
- Some shortcut keys are abnormal #1939

0 comments on commit 4b40cc0

Please sign in to comment.