1
=== modified file 'src/Ubuntu/Components/plugin/ucheader.cpp'
2
--- src/Ubuntu/Components/plugin/ucheader.cpp	2016-04-11 16:40:01 +0000
3
+++ src/Ubuntu/Components/plugin/ucheader.cpp	2016-04-20 15:26:38 +0000
4
@@ -165,11 +165,11 @@
5
165
 *  }
165
 *  }
6
166
 * \endqml
166
 * \endqml
7
167
 *
167
 *
13
168
 * The topMargin of the flickable will automatically be updated to always match
168
 * The topMargin of the flickable will automatically be updated by adding the height
14
169
 * the height of the header. When changing the flickable, the topMargin of the previous
169
 * of the header to the current topMargin. When changing the flickable, the topMargin
15
170
 * flickable is set to 0. When the header is invisible because its visible property is
170
 * of the previous flickable is restored by subtracting the header height from it.
16
171
 * false, or the header has no parent, the flickable topMargin does not reflect the
171
 * Making the header invisible has the same effect on the topMargin as unsetting
17
172
 * header height.
172
 * the flickable.
18
173
 *
173
 *
19
174
 * It is permitted to use a ListView as the value of flickable, but this works
174
 * It is permitted to use a ListView as the value of flickable, but this works
20
175
 * well only if the ListView.header property is not set. Alternatively,
175
 * well only if the ListView.header property is not set. Alternatively,
21
@@ -203,7 +203,7 @@
22
203
        m_previous_header_height = 0;
203
        m_previous_header_height = 0;
23
204
        delta -= m_flickable->topMargin() + m_flickable->contentY();
204
        delta -= m_flickable->topMargin() + m_flickable->contentY();
24
205
205
26
206
        // revert the flickable content Y.
206
        // restore the flickable content Y.
27
207
        m_flickable->setContentY(m_flickable->contentY() + delta);
207
        m_flickable->setContentY(m_flickable->contentY() + delta);
28
208
    }
208
    }
29
209
209
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-04-20
Zsombor Egri		2016-04-20	Approve on 2016-04-20
Review via email: mp+292386@code.launchpad.net
1	=== modified file 'src/Ubuntu/Components/plugin/ucheader.cpp'
2	--- src/Ubuntu/Components/plugin/ucheader.cpp 2016-04-11 16:40:01 +0000
3	+++ src/Ubuntu/Components/plugin/ucheader.cpp 2016-04-20 15:26:38 +0000
4	@@ -165,11 +165,11 @@
5	165	* }	165	* }
6	166	* \endqml	166	* \endqml
7	167	*	167	*
13	168	* The topMargin of the flickable will automatically be updated to always match	168	* The topMargin of the flickable will automatically be updated by adding the height
14	169	* the height of the header. When changing the flickable, the topMargin of the previous	169	* of the header to the current topMargin. When changing the flickable, the topMargin
15	170	* flickable is set to 0. When the header is invisible because its visible property is	170	* of the previous flickable is restored by subtracting the header height from it.
16	171	* false, or the header has no parent, the flickable topMargin does not reflect the	171	* Making the header invisible has the same effect on the topMargin as unsetting
17	172	* header height.	172	* the flickable.
18	173	*	173	*
19	174	* It is permitted to use a ListView as the value of flickable, but this works	174	* It is permitted to use a ListView as the value of flickable, but this works
20	175	* well only if the ListView.header property is not set. Alternatively,	175	* well only if the ListView.header property is not set. Alternatively,
21	@@ -203,7 +203,7 @@
22	203	m_previous_header_height = 0;	203	m_previous_header_height = 0;
23	204	delta -= m_flickable->topMargin() + m_flickable->contentY();	204	delta -= m_flickable->topMargin() + m_flickable->contentY();
24	205		205
26	206	// revert the flickable content Y.	206	// restore the flickable content Y.
27	207	m_flickable->setContentY(m_flickable->contentY() + delta);	207	m_flickable->setContentY(m_flickable->contentY() + delta);
28	208	}	208	}
29	209		209