Merge lp:~fboucault/unity-2d/proper_multiline_text into lp:unity-2d

[Florian Boucault]

[dash] Implemented multi line text properly:
- multiline text not fully displayed is now elided
- not displayed lines are not clipped but simply never shown

Fixes bug https://bugs.launchpad.net/unity-2d/+bug/901491

[Gerry Boland (gerboland)]

This is an improvement on the current situation so I would be happy to merge this.

Comparing with Unity however, it lays out multiline text like:

this is a very long filename which
...avoiding a truncation.ext

Hovering over it doesn't cause it to expand.

You have any comments on this? Could you run it by John?

[Florian Boucault (fboucault)]

> This is an improvement on the current situation so I would be happy to merge
> this.
>
> Comparing with Unity however, it lays out multiline text like:
>
> this is a very long filename which
> ...avoiding a truncation.ext
>
> Hovering over it doesn't cause it to expand.
>
> You have any comments on this? Could you run it by John?

It's a Unity 2D specific behaviour indeed. John is not very happy with it and would like a better solution but also considers it's definitely not a priority at the moment. Bottom line, we can keep it as it is.

[Gerry Boland (gerboland)]

Ok, in it goes.

review: Approve

=== modified file 'places/TextCustom.qml'
--- places/TextCustom.qml	2011-12-01 15:27:35 +0000
+++ places/TextCustom.qml	2011-12-08 00:35:14 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 1.0
+import QtQuick 1.1
 import "fontUtils.js" as FontUtils
 
 /* Custom Text factorising the font style. */
 
=== modified file 'places/TextMultiLine.qml'
--- places/TextMultiLine.qml	2011-06-23 17:08:53 +0000
+++ places/TextMultiLine.qml	2011-12-08 00:35:14 +0000
@@ -16,22 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 1.0
+import QtQuick 1.1
 
 TextCustom {
     id: text
 
-    clip: true
     wrapMode: Text.Wrap
     verticalAlignment: Text.AlignTop
+    maximumLineCount: 2
+    elide: Text.ElideRight
 
     states: [
         State {
             name: "expanded"
             PropertyChanges {
                 target: text
-                clip: false
-                height: paintedHeight
+                maximumLineCount: 5
             }
         }
     ]