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

[lexsurkov]

Fixed inconsistent GUI and keyboard input

Fixed inconsistent GUI and keyboard input

[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

[lexsurkov (lexsurkov)]

Invalid the commit wrote. Added support 'RED' the keys.

[kay van der Zander (kay20)]

what you could do before i test it again. is to keep your commit to one revision.
use uncommit command to change a commit. by unmerged versions here below there should be only one unmerged commit revision 160.

[lexsurkov (lexsurkov)]

The first time I use with SVN. Now the code is correct but the changes do not appear. Maybe lift up a new branch?

[Rico Tzschichholz (ricotz)]

@lexsurkov: Simply using the "Resubmit proposal" option should get this straight again.

But please use a *sane* commit message which is actually describes what you did, instead of this abstract "Fixed bug XXXX".

[lexsurkov (lexsurkov)]

Thank you all, I got a great experience. I will continue to work on themselves and on ElementaryOS

[kay van der Zander (kay20)]

He i have test all keyboards shortcuts for any math related symbols.
I have found one more and that is the symbol '-' see image http://imgur.com/JjOK18H
watch it there are 2 '-' symbols on a international us keyboard.

after this i will approve

review: Needs Fixing

[kay van der Zander (kay20)]

Hey lexsurkov,

sorry for taking so long. i have spoken to the UX team.
They want to have the hyphen symbol which could be addressed by Gdk.key.hyphen.
the U+2212 minus sign is the hyphen symbol.
saidly enough the font we use hasn't support for it see http://www.fileformat.info/info/unicode/char/2212/fontsupport.htm

when using Gdk.key.hyphen it doesn't show anything because of the font support. that is why i approve this implementation of the hyphen symbol. It is the only implementation where the UX requirement is met.
the UX people want to have the minus symbol on the same hight of the plus symbol.

review: Approve

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2015-07-29 21:49:18 +0000
+++ src/MainWindow.vala	2015-09-25 17:20:27 +0000
@@ -410,13 +410,26 @@
         }
 
         private bool key_pressed (Gdk.EventKey key) {
+            bool retval = false;
             switch (key.keyval) {
                 case Gdk.Key.Escape:
                     button_del_clicked ();
                     break;
+                case Gdk.Key.KP_Divide:
+                case Gdk.Key.slash:
+                    key.keyval = Gdk.Key.division;
+                    break;
+                case Gdk.Key.KP_Multiply:
+                case Gdk.Key.asterisk:
+                    key.keyval = Gdk.Key.multiply;
+                    break; 
+                case Gdk.Key.KP_Subtract:
+                case Gdk.Key.minus:
+                    regular_button_clicked ("−");
+                    retval = true;
+                    break;
             }
-
-            return false;
+            return retval;
         }
     }
 }