Changeset View
Changeset View
Standalone View
Standalone View
src/controls/ScrollablePage.qml
| Show First 20 Lines • Show All 178 Lines • ▼ Show 20 Line(s) | 170 | onMainItemChanged: { | |||
|---|---|---|---|---|---|
| 179 | } else if (mainItem.hasOwnProperty("sheetOpen")) { | 179 | } else if (mainItem.hasOwnProperty("sheetOpen")) { | ||
| 180 | if (mainItem.parent === root || mainItem.parent === null) { | 180 | if (mainItem.parent === root || mainItem.parent === null) { | ||
| 181 | mainItem.parent = root; | 181 | mainItem.parent = root; | ||
| 182 | } | 182 | } | ||
| 183 | root.data.push(mainItem); | 183 | root.data.push(mainItem); | ||
| 184 | return; | 184 | return; | ||
| 185 | } | 185 | } | ||
| 186 | 186 | | |||
| 187 | if (scrollView.oldMainItem && scrollView.oldMainItem.hasOwnProperty("parent") && (typeof applicationWindow == 'undefined' || scrollView.oldMainItem.parent !== applicationWindow().overlay)) { | 187 | if (scrollView.oldMainItem && scrollView.oldMainItem instanceof Item && (typeof applicationWindow == 'undefined' || scrollView.oldMainItem.parent !== applicationWindow().overlay)) { | ||
| 188 | scrollView.oldMainItem.parent = overlay | 188 | scrollView.oldMainItem.parent = overlay | ||
| 189 | } | 189 | } | ||
| 190 | scrollView.oldMainItem = mainItem | 190 | scrollView.oldMainItem = mainItem | ||
| 191 | } | 191 | } | ||
| 192 | } | 192 | } | ||