1
=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
2
--- src/Ubuntu/Components/1.3/TextArea.qml	2016-05-25 12:48:10 +0000
3
+++ src/Ubuntu/Components/1.3/TextArea.qml	2016-06-06 14:07:38 +0000
4
@@ -875,6 +875,9 @@
5
875
            }
875
            }
6
876
        }
876
        }
7
877
    }
877
    }
8
878
9
879
    /*! \internal */
10
880
    property Item __rightScrollbar: rightScrollbar
11
878
    Scrollbar {
881
    Scrollbar {
12
879
        id: rightScrollbar
882
        id: rightScrollbar
13
880
        flickableItem: flicker
883
        flickableItem: flicker
14
@@ -884,10 +887,6 @@
15
884
        anchors.topMargin: -internal.frameSpacing
887
        anchors.topMargin: -internal.frameSpacing
16
885
        anchors.rightMargin: -internal.frameSpacing
888
        anchors.rightMargin: -internal.frameSpacing
17
886
        anchors.bottomMargin: -internal.frameSpacing
889
        anchors.bottomMargin: -internal.frameSpacing
18
887
        Ubuntu.StyleHints {
19
888
            // No background color
20
889
            troughColorSteppersStyle: Qt.rgba(0, 0, 0, 0)
21
890
        }
22
891
    }
890
    }
23
892
891
24
893
    styleName: "TextAreaStyle"
892
    styleName: "TextAreaStyle"
25
894
893
26
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml'
27
--- src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml	2016-05-10 12:08:32 +0000
28
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml	2016-06-06 14:07:38 +0000
29
@@ -76,6 +76,12 @@
30
76
            radius: units.gu(1.7)
76
            radius: units.gu(1.7)
31
77
            backgroundColor: visuals.backgroundColor
77
            backgroundColor: visuals.backgroundColor
32
78
            aspect: UbuntuShape.Flat
78
            aspect: UbuntuShape.Flat
33
79
            source: ShaderEffectSource {
34
80
                sourceItem: styledItem.__rightScrollbar ? styledItem.__rightScrollbar : null
35
81
                hideSource: true
36
82
            }
37
83
            sourceFillMode: UbuntuShape.Pad
38
84
            sourceHorizontalAlignment: UbuntuShape.AlignRight
39
79
        }
85
        }
40
80
    }
86
    }
41
81
87
42
82
88
43
=== added file 'tests/unit/performance/TextArea13Grid.qml'
44
--- tests/unit/performance/TextArea13Grid.qml	1970-01-01 00:00:00 +0000
45
+++ tests/unit/performance/TextArea13Grid.qml	2016-06-06 14:07:38 +0000
46
@@ -0,0 +1,33 @@
47
1
/*
48
2
 * Copyright 2016 Canonical Ltd.
49
3
 *
50
4
 * This program is free software; you can redistribute it and/or modify
51
5
 * it under the terms of the GNU Lesser General Public License as published by
52
6
 * the Free Software Foundation; version 3.
53
7
 *
54
8
 * This program is distributed in the hope that it will be useful,
55
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
56
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
57
11
 * GNU Lesser General Public License for more details.
58
12
 *
59
13
 * You should have received a copy of the GNU Lesser General Public License
60
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
61
15
 */
62
16
63
17
import QtQuick 2.0
64
18
import Ubuntu.Components 1.3
65
19
66
20
Grid {
67
21
    width: units.gu(80)
68
22
    height: units.gu(60)
69
23
    rows: 16
70
24
    columns: 16
71
25
72
26
    Repeater {
73
27
        model: 16 * 16
74
28
75
29
        TextField {
76
30
            text: i18n.tr("Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.")
77
31
        }
78
32
    }
79
33
}
80
0
34
81
=== modified file 'tests/unit/performance/tst_performance.cpp'
82
--- tests/unit/performance/tst_performance.cpp	2015-12-07 22:16:52 +0000
83
+++ tests/unit/performance/tst_performance.cpp	2016-06-06 14:07:38 +0000
84
@@ -102,6 +102,7 @@
85
102
        QTest::addColumn<QString>("document");
102
        QTest::addColumn<QString>("document");
86
103
        QTest::addColumn<QUrl>("theme");
103
        QTest::addColumn<QUrl>("theme");
87
104
104
88
105
        QTest::newRow("TextArea 1.3") << "TextArea13Grid.qml" << QUrl();
89
105
        QTest::newRow("AbstractButton 1.2") << "AbstractButtonGrid.qml" << QUrl();
106
        QTest::newRow("AbstractButton 1.2") << "AbstractButtonGrid.qml" << QUrl();
90
106
        QTest::newRow("AbstractButton 1.3") << "AbstractButton13Grid.qml" << QUrl();
107
        QTest::newRow("AbstractButton 1.3") << "AbstractButton13Grid.qml" << QUrl();
91
107
        QTest::newRow("grid with Rectangle") << "RectangleGrid.qml" << QUrl();
108
        QTest::newRow("grid with Rectangle") << "RectangleGrid.qml" << QUrl();
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Needs Fixing on 2016-06-08
Loïc Molinari (community)		2016-06-06	Approve on 2016-06-08
Review via email: mp+296551@code.launchpad.net