Merge lp:~rpadovani/ubuntu-calculator-app/resultTextfield into lp:ubuntu-calculator-app

[Riccardo Padovani]

Improved the texfield where calc are inserted

Improved the texfield where calc are inserted

[Bartosz Kosiorek (gang65)]

I think TextField better fit our needs (please take a look at my comments)

Could you please check it by yourself?

If something do not working correctly, I could fix TextField (as I did before).

review: Needs Fixing

[Riccardo Padovani (rpadovani)]

I thought about that. In a first implementation, I used TextField, unfortunately it's hard to stilish it. I think it's easier to implement the tooltip for TextInput than implement style for TextField.

Maybe I miss something, so please let me know if there is a better way

[lp:~rpadovani/ubuntu-calculator-app/resultTextfield]

18. By Riccardo Padovani on 2014-12-02

Use Textfield instead TextInput

[Riccardo Padovani (rpadovani)]

Yap, stupid comment, fixed both, thanks for the suggestion

[Bartosz Kosiorek (gang65)]

Copy/paste works perfectly for me.

Thanks Riccardo!

review: Approve

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2014-11-28 20:54:49 +0000
+++ app/ubuntu-calculator-app.qml	2014-12-02 00:01:03 +0000
@@ -17,6 +17,7 @@
  */
 import QtQuick 2.3
 import Ubuntu.Components 1.1
+import Ubuntu.Components.Themes.Ambiance 0.1
 
 import "ui"
 import "engine/math.js" as MathJs
@@ -247,10 +248,31 @@
         footer: Column {
             width: parent.width
 
-            Text {
-                width: parent.width
-                height: units.gu(5)
+            TextField {
+                height: units.gu(6)
+                // Workaround to align text to right due bug #1320885
+                // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1320885
+                //width: parent.width - units.gu(2)
+                width: contentWidth + units.gu(3)
+                //anchors.horizontalCenter: parent.horizontalCenter
+                anchors.right: parent.right
+                anchors.rightMargin: units.gu(1)
+
+                // remove ubuntu shape
+                style: TextFieldStyle {
+                    background: Item {
+                    }
+                }
+
                 text: displayedInputText
+                font.pixelSize: units.gu(4)
+
+                // Decomment that when upstream bug is fixed
+                //verticalAlignment: TextInput.AlignVCenter
+                //horizontalAlignment: TextInput.AlignRight
+
+                readOnly: true
+                selectByMouse: true
             }
 
             // TODO: insert here actual screen