Merge lp:~robru/gwibber/infuriating-margins into lp:gwibber

[Robert Bruce Park]

This commit stops the protocol icons from overlapping the divider line after the details have been hidden, but it also gives the details view a goofily large margin (which is nicely sized when replies are present but comically large when there are no replies).

[Ken VanDine (ken-vandine)]

Thanks

review: Approve

=== modified file 'qml/StatusUpdateTile.qml'
--- qml/StatusUpdateTile.qml	2013-03-21 03:02:27 +0000
+++ qml/StatusUpdateTile.qml	2013-03-22 18:23:27 +0000
@@ -286,9 +286,6 @@
     states: [State {
                 name: "Details"
                 PropertyChanges { target: tile; detailsOpacity: 1; x: 0 }
-                /* Looks like we don't need to resize to grow, but we do for reducing
-                PropertyChanges { target: content; height: status_update_content.height + detailsWrapper.height}
-                */
                 StateChangeScript {
                     script: {
                         listView.positionViewAtIndex(listView.indexAt(parent.x, parent.y) - 1, ListView.Contain);
@@ -298,7 +295,10 @@
             },
             State {
                 name: "List"
-                PropertyChanges { target: content; height: status_update_content.height }
+                PropertyChanges {
+                    target: content
+                    height: status_update_content.height + units.gu(2)
+                }
                 PropertyChanges { target: tile; detailsOpacity: 0; x: 0 }
             }]
 
@@ -324,7 +324,7 @@
 
     Item {
         id: detailsWrapper
-        height: detailsLoader.height
+        height: detailsLoader.height + units.gu(1)
         width: parent.width
         opacity: detailsOpacity
         visible:  detailsOpacity > 0 ? true : false
@@ -338,6 +338,7 @@
         Loader {
             id: detailsLoader
             width: parent.width
+            visible: true
         }
 
         onVisibleChanged: {

=== modified file 'qml/StatusUpdateTileDetails.qml'
--- qml/StatusUpdateTileDetails.qml	2013-03-21 03:02:27 +0000
+++ qml/StatusUpdateTileDetails.qml	2013-03-22 18:23:27 +0000
@@ -22,7 +22,7 @@
 
 Item {
     id: details
-    height: visible ? entryArea.height + pictureWrapper.height + threadView.height + units.gu(3) : 0
+    height: visible ? childrenRect.height + units.gu(1) : 0
 
     property alias hasFocus: entryArea.activeFocus
     onFocusChanged: {

=== modified file 'qml/TimeLine.qml'
--- qml/TimeLine.qml	2013-03-22 01:27:37 +0000
+++ qml/TimeLine.qml	2013-03-22 18:23:27 +0000
@@ -53,7 +53,7 @@
             ThinDivider {}
         }
     }
-    
+
     StreamModel {
         id: streamModel
     }
@@ -130,7 +130,7 @@
         repeat: false
         triggeredOnStart: false
         running: false
-        onTriggered: { 
+        onTriggered: {
             top();
         }
     }