Merge lp:~lexsurkov/pantheon-calculator/Bug_1409485 into lp:~elementary-apps/pantheon-calculator/trunk

[lexsurkov]

Fixed Bug_1409485

Fixed Bug_1409485

[xapantu (xapantu)]

It looks like you forgot to commit your changes, this branch is the same as the trunk.

review: Needs Information

[xapantu (xapantu)]

Hum, listening to the event signal directly is not needed. Maybe you can just move your code to the key_pressed method?

review: Needs Fixing

[lexsurkov (lexsurkov)]

Thank you, hastened to, not tested in the method key_pressed. In the future, I will carefully)))
Now I corrected.
.

> 15.09.2015, 2:18:25 пользователь xapantu (<email address hidden>) написал:
>
> Review: Needs Fixing
>
> Hum, listening to the event signal directly is not needed. Maybe you can just move your code to the key_pressed method?
> --
> https://code.launchpad.net/~lexsurkov/pantheon-calculator/Bug_1409485/+merge/269764
> You are the owner of lp:~lexsurkov/pantheon-calculator/Bug_1409485.
>
>

[kay van der Zander (kay20)]

the targeted bug is still not fixed in this branch.

http://imgur.com/H84xfbB you see there is still possible to get the wrong representation of multiply and devide.

http://imgur.com/YHRZjaw the red keys give the wrong representation the green keys work.

review: Needs Fixing

[lp:~lexsurkov/pantheon-calculator/Bug_1409485]

160. By lexsurkov on 2015-09-25

Fixed inconsistent GUI and keyboard input

Unmerged revisions

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2015-07-29 21:49:18 +0000
+++ src/MainWindow.vala	2015-09-17 16:21:57 +0000
@@ -414,6 +414,18 @@
                 case Gdk.Key.Escape:
                     button_del_clicked ();
                     break;
+                case Gdk.Key.KP_Divide:
+                    key.keyval = Gdk.Key.division;
+                    break;
+                case Gdk.Key.slash:
+                    key.keyval = Gdk.Key.division;
+                    break;
+                case Gdk.Key.KP_Multiply:
+                    key.keyval = Gdk.Key.multiply;
+                    break;
+                case Gdk.Key.asterisk:
+                    key.keyval = Gdk.Key.multiply;
+                    break;
             }
 
             return false;