Merge lp:~samertm/ubuntu-calculator-app/fixes-1273887 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Samer Masterson]

 * Operators do not change screen when it is cleared

 * Operators do not change screen when it is cleared

I made this fix by moving the variable newCalculation out of root in Screen.qml and into formulaView in SimplePage.qml. This is because I couldn't figure out how to write a signal handler in Screen.qml that used a signal defined in formulaView. If there's a clearer solution, feel free to reject this merge! :)

[Mihir Soni (mihirsoni)]

Could you go to this line
http://bazaar.launchpad.net/~ubuntu-calculator-dev/ubuntu-calculator-app/trunk/view/head:/Simple/SimplePage.qml#L131

and replace this line with following :-

screenFormula = [{_text:'0', _operation: '', _number:''}];

This should work, could you please let me know ?

[Samer Masterson (samertm)]

When you make that change, the label is changed to 0, like this (after following the steps to reproduce the bug): http://imgur.com/ZzGUVO0. It also doesn't work when you set _number to '0'.

[Mihir Soni (mihirsoni)]

Hi samer,

I did try to put 0 in place of Number , and it is working fine.

Could you take the latest and try doing this??

review: Needs Fixing

[Samer Masterson (samertm)]

This was how the app acted when I changed the line to:
screenFormula = [{_text:'', _operation: '', _number:'0'}];

http://www.youtube.com/watch?v=c5nULrERgGk&feature=youtu.be

For the first 5 seconds, I hit the operators before hitting clear. I hit clear 6 seconds in, and you can see the calculator screen move downwards. It also tacks '0' onto the number if you start typing.

[Samer Masterson (samertm)]

> I hit clear 6 seconds in, and you can see the calculator screen move downwards.

*and you can see the calculator screen move downwards after I press an operator button.

[Samer Masterson (samertm)]

Has there been any movement on this issue?

[Riccardo Padovani (rpadovani)]

Sorry for the late response Samer.

I notice a wrong behavior:
- Start the app
- Press *
- The '0' disappears

review: Needs Fixing

[Samer Masterson (samertm)]

That's alright!

Can you elaborate on how you ran into the issue? Testing a fresh fetch of my code solves the bug, as seen here: http://www.youtube.com/watch?v=pFNmhMz0jeg&feature=youtu.be

Additionally, when I apply the diff to the trunk, the bug is still fixed.

[Riccardo Padovani (rpadovani)]

Mhh, right, you have to do a calc before:
- Start the app
- Do a calc and tear off
- Close the app
- Restart the app
- Press * as first button
- 0 disappears.

It's a very corner case, because it exist only on first calc, only if you press an operator as first button and only if there is at least a calc in history

[David Planella (dpm)]

Samer, this branch has been in status "Needs Fixing" for quite a while. Have you had the chance to look into the issues pointed out by Riccardo?

review: Needs Information

Unmerged revisions

215. By Samer Masterson on 2014-02-04

 * Operators do not change screen when it is cleared

=== modified file 'Simple/CalcLabel.qml'
--- Simple/CalcLabel.qml	2014-01-12 17:48:38 +0000
+++ Simple/CalcLabel.qml	2014-02-04 05:17:41 +0000
@@ -121,7 +121,7 @@
             fontSizeMode: Text.Fit
             horizontalAlignment: Text.AlignRight
             // If is a new calculation or if last calculation as been deleted print 0, else the number
-            text: ((isLast && !newCalculation) || (root.numbers === "" && formulaView.headerItem.state !== "newPush")) ? "0" : root.numbers
+            text: ((isLast && !formulaView.newCalculation) || (root.numbers === "" && formulaView.headerItem.state !== "newPush")) ? "0" : root.numbers
         }
     }
 }

=== modified file 'Simple/Screen.qml'
--- Simple/Screen.qml	2014-01-12 17:48:38 +0000
+++ Simple/Screen.qml	2014-02-04 05:17:41 +0000
@@ -27,7 +27,6 @@
     transformOrigin: Item.Bottom
 
     property var ops
-    property bool newCalculation: false
     signal useAnswer(string answerToUse, string formulaData)
     signal labelTextUpdated(int idx, string newText)
     signal mainLabelUpdated(int idx, string newText)
@@ -150,7 +149,7 @@
                 id: row
                 height: units.gu(4)
                 width: parent.width
-                visible: !isLastItem || newCalculation && formulaView.headerItem.state !== ""
+                visible: !isLastItem || formulaView.newCalculation && formulaView.headerItem.state !== ""
                 Item {
                     id: editIcon
                     objectName: "editIcon"
@@ -288,11 +287,11 @@
                         }
 
                         onNumbersChanged: {
-                            newCalculation = true
+                            formulaView.newCalculation = true
                         }
 
                         onOperationChanged: {
-                            newCalculation = true
+                            formulaView.newCalculation = true
                         }
 
                         /*

=== modified file 'Simple/SimplePage.qml'
--- Simple/SimplePage.qml	2014-01-28 23:56:49 +0000
+++ Simple/SimplePage.qml	2014-02-04 05:17:41 +0000
@@ -131,6 +131,7 @@
         screenFormula = [{_text:'', _operation: '', _number:''}];
         formula = new F.Formula();
         formulaView.currentOperatorsChanged();
+        formulaView.newCalculation = false; // sets display to 0
     }
 
     function addFromMemory(numberToAdd) {
@@ -284,6 +285,8 @@
             property bool __toBeRefresh: false
             property int __displaceDist: contentY - __initialContentY
 
+            property bool newCalculation: false
+
             signal currentOperatorsChanged()
 
             function addCurrentToMemory() {