1
=== modified file 'src/Ubuntu/UbuntuToolkit/ucunits.cpp'
2
--- src/Ubuntu/UbuntuToolkit/ucunits.cpp	2016-07-20 07:49:54 +0000
3
+++ src/Ubuntu/UbuntuToolkit/ucunits.cpp	2016-08-11 15:13:26 +0000
4
@@ -71,16 +71,15 @@
5
71
*/
71
*/
6
72
72
7
73
/*
73
/*
9
74
 * Note on the interaction between GRID_UNIT_PX and QT_DEVICE_PIXEL_RATIO
74
 * In Qt5.6 the following variables affect scaling in QWidget and QML:
10
75
 *   1. QT_SCALE_FACTOR: global integer scale factor, including point-sized fonts
11
76
 *   2. QT_SCREEN_SCALE_FACTORS: a list of scale factors
12
77
 *   3. QT_AUTO_SCREEN_SCALE_FACTOR: enables automatic scaling heuristics
13
75
 *
78
 *
14
76
 * In Qt5.4 there is a single means to scale the UI: the QT_DEVICE_PIXEL_RATIO environment
79
 * In Qt5.4 there is a single means to scale the UI: the QT_DEVICE_PIXEL_RATIO environment
15
77
 * variable. This accepts only integer values, thus allowing a x2 or x3 scaling of any
80
 * variable. This accepts only integer values, thus allowing a x2 or x3 scaling of any
16
78
 * Qt-based UI, that includes QWidget as well as any QML UI.
81
 * Qt-based UI, that includes QWidget as well as any QML UI.
17
79
 *
82
 *
18
80
 * Setting QT_DEVICE_PIXEL_RATIO=2 implies one density-independent pixel corresponds to 2
19
81
 * physical pixels. Developers describe their UI in terms of density-independent pixels.
20
82
 * Qt scales accordingly.
21
83
 *
22
84
 * The Ubuntu UI Toolkit has solved the scaling problem with the GRID_UNIT_PX variable.
83
 * The Ubuntu UI Toolkit has solved the scaling problem with the GRID_UNIT_PX variable.
23
85
 * It offers more flexibility, but only scales QML applications written to use the UITK
84
 * It offers more flexibility, but only scales QML applications written to use the UITK
24
86
 * (since it uses this Units class) as it is built on top of QML.
85
 * (since it uses this Units class) as it is built on top of QML.
25
87
86
26
=== modified file 'tests/unit/units/dpr1/tst_units.cpp'
27
--- tests/unit/units/dpr1/tst_units.cpp	2016-07-07 15:33:34 +0000
28
+++ tests/unit/units/dpr1/tst_units.cpp	2016-08-11 15:13:26 +0000
29
@@ -28,7 +28,7 @@
30
28
private Q_SLOTS:
28
private Q_SLOTS:
31
29
29
32
30
    void defaultGridUnit() {
30
    void defaultGridUnit() {
34
31
        qputenv("GRID_UNIT_PX", "");
31
        qunsetenv("GRID_UNIT_PX");
35
32
        UCUnits units;
32
        UCUnits units;
36
33
        QCOMPARE(units.gridUnit(), 8.0f);
33
        QCOMPARE(units.gridUnit(), 8.0f);
37
34
    }
34
    }
38
@@ -46,7 +46,7 @@
39
46
        qputenv("GRID_UNIT_PX", gridUnit);
46
        qputenv("GRID_UNIT_PX", gridUnit);
40
47
        UCUnits units;
47
        UCUnits units;
41
48
        QCOMPARE(units.gridUnit(), 11.0);
48
        QCOMPARE(units.gridUnit(), 11.0);
43
49
        qputenv("GRID_UNIT_PX", "");
49
        qunsetenv("GRID_UNIT_PX");
44
50
    }
50
    }
45
51
51
46
52
    void dpGridUnitDefault() {
52
    void dpGridUnitDefault() {
47
53
53
48
=== modified file 'tests/unit/units/dpr2/tst_units_dpr2.cpp'
49
--- tests/unit/units/dpr2/tst_units_dpr2.cpp	2016-07-07 15:33:34 +0000
50
+++ tests/unit/units/dpr2/tst_units_dpr2.cpp	2016-08-11 15:13:26 +0000
51
@@ -135,6 +135,8 @@
52
135
int main(int argc, char *argv[])
135
int main(int argc, char *argv[])
53
136
{
136
{
54
137
    qputenv("QT_DEVICE_PIXEL_RATIO", "2");
137
    qputenv("QT_DEVICE_PIXEL_RATIO", "2");
55
138
    qputenv("QT_SCALE_FACTOR", "2");
56
139
    qunsetenv("GRID_UNIT_PX");
57
138
140
58
139
    QGuiApplication app(argc, argv);
141
    QGuiApplication app(argc, argv);
59
140
    app.setAttribute(Qt::AA_Use96Dpi, true);
142
    app.setAttribute(Qt::AA_Use96Dpi, true);
60
141
143
61
=== modified file 'tests/unit/units/dpr3/tst_units_dpr3.cpp'
62
--- tests/unit/units/dpr3/tst_units_dpr3.cpp	2016-07-07 15:33:34 +0000
63
+++ tests/unit/units/dpr3/tst_units_dpr3.cpp	2016-08-11 15:13:26 +0000
64
@@ -80,6 +80,8 @@
65
80
int main(int argc, char *argv[])
80
int main(int argc, char *argv[])
66
81
{
81
{
67
82
    qputenv("QT_DEVICE_PIXEL_RATIO", "3");
82
    qputenv("QT_DEVICE_PIXEL_RATIO", "3");
68
83
    qputenv("QT_SCALE_FACTOR", "3");
69
84
    qunsetenv("GRID_UNIT_PX");
70
83
85
71
84
    QGuiApplication app(argc, argv);
86
    QGuiApplication app(argc, argv);
72
85
    app.setAttribute(Qt::AA_Use96Dpi, true);
87
    app.setAttribute(Qt::AA_Use96Dpi, true);
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-08-12
Zsombor Egri		2016-08-11	Approve on 2016-08-12
Review via email: mp+302648@code.launchpad.net