1
=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
2
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-03-16 09:15:39 +0000
3
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-05-10 07:10:08 +0000
4
@@ -788,7 +788,7 @@
5
788
                    bottom: parent.bottom
788
                    bottom: parent.bottom
6
789
                    left: parent.left
789
                    left: parent.left
7
790
                    right: parent.right
790
                    right: parent.right
9
791
                    rightMargin: dividerThickness
791
                    rightMargin: dividerThickness + verticalDivider.width
10
792
                }
792
                }
11
793
                Item {
793
                Item {
12
794
                    id: hiddenItem
794
                    id: hiddenItem
13
@@ -806,6 +806,7 @@
14
806
                    left: parent.left
806
                    left: parent.left
15
807
                    top: parent.top
807
                    top: parent.top
16
808
                    right: parent.right
808
                    right: parent.right
17
809
                    rightMargin: dividerThickness + verticalDivider.width
18
809
                }
810
                }
19
810
                height: body.headerHeight
811
                height: body.headerHeight
20
811
812
21
@@ -856,7 +857,7 @@
22
856
                    right: parent.right
857
                    right: parent.right
23
857
                    rightMargin: dividerThickness
858
                    rightMargin: dividerThickness
24
858
                }
859
                }
26
859
                width: (column == (d.columns - 1)) || !pageWrapper ? 0 : units.dp(1)
860
                width: (column == (d.columns - 1)) ? 0 : units.dp(1)
27
860
                color: theme.palette.normal.base
861
                color: theme.palette.normal.base
28
861
                MouseArea {
862
                MouseArea {
29
862
                    id: resizerSensing
863
                    id: resizerSensing
30
@@ -923,7 +924,7 @@
31
923
                wrapper.active = false;
924
                wrapper.active = false;
32
924
                subHeader.config = null;
925
                subHeader.config = null;
33
925
                pageWrapper = null;
926
                pageWrapper = null;
35
926
                wrapper.parent = hiddenPool;
927
                wrapper.parent = hiddenItem;
36
927
                wrapper.pageHolder = null;
928
                wrapper.pageHolder = null;
37
928
                return wrapper;
929
                return wrapper;
38
929
            }
930
            }
39
930
931
40
=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
41
--- src/Ubuntu/Components/plugin/uclistitem.cpp	2016-04-26 10:21:32 +0000
42
+++ src/Ubuntu/Components/plugin/uclistitem.cpp	2016-05-10 07:10:08 +0000
43
@@ -1140,9 +1140,6 @@
44
1140
        updateNode = true;
1140
        updateNode = true;
45
1141
    }
1141
    }
46
1142
    QRectF rect(boundingRect());
1142
    QRectF rect(boundingRect());
47
1143
    // FIXME: The 1dp margin is here so that part of the focus frame
48
1144
    //  is not hidden by the APL divider. See bug #1575060.
49
1145
    rect -= QMarginsF(0, 0, UCUnits::instance()->dp(1), 0);
50
1146
    d->divider->setOpacity(paintFocus ? 0.0 : 1.0);
1143
    d->divider->setOpacity(paintFocus ? 0.0 : 1.0);
51
1147
    rectNode->setRect(rect);
1144
    rectNode->setRect(rect);
52
1148
1145
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-05-10
Tim Peeters		2016-04-27	Approve on 2016-05-10
Review via email: mp+293058@code.launchpad.net