@@ -137,62 +137,66 @@ Rectangle {
137137 }
138138 }
139139
140− Rectangle {
140+ Flickable {
141141 id: controls
142− color: "darkgrey"
143− width: units.gu(30)
142+ contentHeight: controlRect.height
143+
144144 anchors.top: root.top
145145 anchors.bottom: root.bottom
146146 anchors.right: root.right
147+ width: units.gu(30)
148+
149+ Rectangle {
150+ id: controlRect
151+ anchors { left: parent.left; right: parent.right }
152+ color: "darkgrey"
153+ height: childrenRect.height + units.gu(2)
154+
155+ Column {
156+ anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
157+ spacing: units.gu(1)
158+
159+ Button {
160+ text: "Show Greeter"
161+ activeFocusOnPress: false
162+ onClicked: {
163+ if (shellLoader.status !== Loader.Ready)
164+ return;
147165
148− Column {
149− anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
150− spacing: units.gu(1)
151− Button {
152− text: "Show Greeter"
153− activeFocusOnPress: false
154− onClicked: {
155− if (shellLoader.status !== Loader.Ready)
156− return;
157−
158− var greeter = testCase.findChild(shellLoader.item, "greeter");
159− if (!greeter.shown) {
160− LightDM.Greeter.showGreeter();
166+ var greeter = testCase.findChild(shellLoader.item, "greeter");
167+ if (!greeter.shown) {
168+ LightDM.Greeter.showGreeter();
169+ }
161170 }
162171 }
163− }
164− ListItem.ItemSelector {
165− anchors { left: parent.left; right: parent.right }
166− activeFocusOnPress: false
167− text: "LightDM mock mode"
168− model: ["single", "single-passphrase", "single-pin", "full"]
169− onSelectedIndexChanged: {
170− shellLoader.active = false;
171− LightDM.Greeter.mockMode = model[selectedIndex];
172− LightDM.Users.mockMode = model[selectedIndex];
173− shellLoader.active = true;
172+ ListItem.ItemSelector {
173+ anchors { left: parent.left; right: parent.right }
174+ activeFocusOnPress: false
175+ text: "LightDM mock mode"
176+ model: ["single", "single-passphrase", "single-pin", "full"]
177+ onSelectedIndexChanged: {
178+ shellLoader.active = false;
179+ LightDM.Greeter.mockMode = model[selectedIndex];
180+ LightDM.Users.mockMode = model[selectedIndex];
181+ shellLoader.active = true;
182+ }
174183 }
175− }
176− ListItem.ItemSelector {
177− anchors { left: parent.left; right: parent.right }
178− activeFocusOnPress: false
179− text: "Size"
180− model: ["phone", "tablet", "desktop"]
181− onSelectedIndexChanged: {
182− shellLoader.active = false;
183− shellLoader.state = model[selectedIndex];
184− shellLoader.active = true;
184+ ListItem.ItemSelector {
185+ anchors { left: parent.left; right: parent.right }
186+ activeFocusOnPress: false
187+ text: "Size"
188+ model: ["phone", "tablet", "desktop"]
189+ onSelectedIndexChanged: {
190+ shellLoader.active = false;
191+ shellLoader.state = model[selectedIndex];
192+ shellLoader.active = true;
193+ }
194+ }
195+ MouseTouchEmulationCheckbox {
196+ id: mouseEmulation
197+ checked: true
198+ color: "white"
185199 }
186− }
187− MouseTouchEmulationCheckbox {
188− id: mouseEmulation
189− checked: true
190− color: "white"
191− }
192−
193− Column {
194− anchors { left: parent.left; right: parent.right }
195− spacing: units.gu(1)
196200
197201 Label { text: "Applications"; font.bold: true }
198202
@@ -281,7 +285,6 @@ Rectangle {
281285 }
282286
283287 function cleanup() {
284− mouseEmulation.checked = true;
285288 tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
286289 tearDown();
287290 }