Fixed Bug 1554813 - Enter key on numpad in Emojier

This commit is contained in:
Takao Fujiwara 2018-03-15 17:38:34 +09:00
parent 1ed40fb814
commit 76af58317c
2 changed files with 81 additions and 2 deletions

View File

@ -0,0 +1,74 @@
From c6439d74d5472c95de4d5c2cdc6487bfd508e3d8 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 15 Mar 2018 16:57:02 +0900
Subject: [PATCH] ui/gtk3: Add num pad Enter, Down, Up, Left, Right on Emojier
BUG=rhbz#1554813
R=Shawn.P.Huang@gmail.com
Review URL: https://codereview.appspot.com/337690043
---
ui/gtk3/emojier.vala | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
index 8707e432..24029703 100644
--- a/ui/gtk3/emojier.vala
+++ b/ui/gtk3/emojier.vala
@@ -1918,6 +1918,7 @@ public class IBusEmojier : Gtk.ApplicationWindow {
return true;
break;
case Gdk.Key.Return:
+ case Gdk.Key.KP_Enter:
key_press_enter();
return true;
case Gdk.Key.BackSpace:
@@ -1959,29 +1960,37 @@ public class IBusEmojier : Gtk.ApplicationWindow {
}
return true;
case Gdk.Key.Right:
- key_press_cursor_horizontal(keyval, modifiers);
+ case Gdk.Key.KP_Right:
+ key_press_cursor_horizontal(Gdk.Key.Right, modifiers);
return true;
case Gdk.Key.Left:
- key_press_cursor_horizontal(keyval, modifiers);
+ case Gdk.Key.KP_Left:
+ key_press_cursor_horizontal(Gdk.Key.Left, modifiers);
return true;
case Gdk.Key.Down:
- key_press_cursor_vertical(keyval, modifiers);
+ case Gdk.Key.KP_Down:
+ key_press_cursor_vertical(Gdk.Key.Down, modifiers);
return true;
case Gdk.Key.Up:
- key_press_cursor_vertical(keyval, modifiers);
+ case Gdk.Key.KP_Up:
+ key_press_cursor_vertical(Gdk.Key.Up, modifiers);
return true;
case Gdk.Key.Page_Down:
- key_press_cursor_vertical(keyval, modifiers);
+ case Gdk.Key.KP_Page_Down:
+ key_press_cursor_vertical(Gdk.Key.Page_Down, modifiers);
return true;
case Gdk.Key.Page_Up:
- key_press_cursor_vertical(keyval, modifiers);
+ case Gdk.Key.KP_Page_Up:
+ key_press_cursor_vertical(Gdk.Key.Page_Up, modifiers);
return true;
case Gdk.Key.Home:
- if (key_press_cursor_home_end(keyval, modifiers))
+ case Gdk.Key.KP_Home:
+ if (key_press_cursor_home_end(Gdk.Key.Home, modifiers))
return true;
break;
case Gdk.Key.End:
- if (key_press_cursor_home_end(keyval, modifiers))
+ case Gdk.Key.KP_End:
+ if (key_press_cursor_home_end(Gdk.Key.End, modifiers))
return true;
break;
case Gdk.Key.Insert:
--
2.14.3

View File

@ -30,7 +30,7 @@
Name: ibus
Version: 1.5.18
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@ -41,6 +41,7 @@ Source2: %{name}.conf.5
# Will remove the annotation tarball once the rpm is available on Fedora
# Upstreamed patches.
# Patch0: %%{name}-HEAD.patch
Patch0: %{name}-HEAD.patch
%if %with_emoji_harfbuzz
# Under testing self rendering until Pango, Fontconfig, Cairo are stable
Patch1: %{name}-xx-emoji-harfbuzz.patch
@ -248,6 +249,7 @@ The ibus-devel-docs package contains developer documentation for IBus
%prep
%setup -q
# %%patch0 -p1
%patch0 -p1
# cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c ||
%if %with_emoji_harfbuzz
%patch1 -p1 -z .hb
@ -429,8 +431,11 @@ dconf update || :
%{_datadir}/gtk-doc/html/*
%changelog
* Thu Mar 15 2018 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.18-3
- Fixed Bug 1554813 - Enter key on numpad in Emojier
* Fri Mar 09 2018 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.18-2
= Rebuilt for cldr-emoji-annotation-32.90.0_1 and unicode-emoji-10.90.20180207
- Rebuilt for cldr-emoji-annotation-32.90.0_1 and unicode-emoji-10.90.20180207
* Fri Mar 02 2018 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.18-1
- Bumped to 1.5.18