git.iko.soy/unity8
on xenial help sign in
Fixed binding being cleared when manually changing slider value (lp#1283191). Fixes: 1283191
e0a2139Nick Dedekind
plugins/Unity/Indicators/qml/MenuItemFactory.qml+7−1
compare with xenial
unifiedsplit
@@ -77,6 +77,7 @@ Item {
77 property var menuModel: menuFactory.menuModel
77 property var menuModel: menuFactory.menuModel
78 property int menuIndex: -1
78 property int menuIndex: -1
79 property var extendedData: menuData && menuData.ext || undefined
79 property var extendedData: menuData && menuData.ext || undefined
80+ property var serverValue: getExtendedProperty(menuData, "actionState", undefined)
80
81
81 text: menuData && menuData.label || ""
82 text: menuData && menuData.label || ""
82 iconSource: menuData && menuData.icon || ""
83 iconSource: menuData && menuData.icon || ""
@@ -91,7 +92,6 @@ Item {
91 }
92 }
92 return maximum;
93 return maximum;
93 }
94 }
94− value: menuData && menuData.actionState || 0.0
95 enabled: menuData && menuData.sensitive || false
95 enabled: menuData && menuData.sensitive || false
96
96
97 onMenuModelChanged: {
97 onMenuModelChanged: {
@@ -100,6 +100,12 @@ Item {
100 onMenuIndexChanged: {
100 onMenuIndexChanged: {
101 loadAttributes();
101 loadAttributes();
102 }
102 }
103+ onServerValueChanged: {
104+ // value can be changed by slider, so a binding won't work.
105+ if (serverValue !== undefined) {
106+ value = serverValue;
107+ }
108+ }
103 onUpdated: {
109 onUpdated: {
104 menuModel.changeState(menuIndex, value);
110 menuModel.changeState(menuIndex, value);
105 }
111 }
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+47−6
@@ -148,14 +148,14 @@ Item {
148
148
149 function test_create_sliderMenu_data() {
149 function test_create_sliderMenu_data() {
150 return [
150 return [
151− {label: "testLabel1", enabled: false, minValue: 0, maxValue: 100, value: 10.5 },
151+ {tag: "disabled", enabled: false, minValue: 0, maxValue: 100, value1: 10.5, value2: 22 },
152− {label: "testLabel2", enabled: true, minValue: 0, maxValue: 100, value: 100 },
152+ {tag: "enabled", enabled: true, minValue: 0, maxValue: 100, value1: 100, value2: 50 },
153 ];
153 ];
154 }
154 }
155
155
156 function test_create_sliderMenu(data) {
156 function test_create_sliderMenu(data) {
157 menuData.type = "com.canonical.indicator.slider"
157 menuData.type = "com.canonical.indicator.slider"
158− menuData.label = data.label;
158+ menuData.label = data.tag;
159 menuData.sensitive = data.enabled;
159 menuData.sensitive = data.enabled;
160 menuData.ext = {
160 menuData.ext = {
161 'minIcon': "file:///testMinIcon",
161 'minIcon': "file:///testMinIcon",
@@ -163,20 +163,61 @@ Item {
163 'minValue': data.minValue,
163 'minValue': data.minValue,
164 'maxValue': data.maxValue
164 'maxValue': data.maxValue
165 };
165 };
166− menuData.actionState = data.value;
166+ menuData.actionState = data.value1;
167
167
168 loader.data = menuData;
168 loader.data = menuData;
169 loader.sourceComponent = factory.load(menuData);
169 loader.sourceComponent = factory.load(menuData);
170 tryCompareFunction(function() { return loader.item != undefined; }, true);
170 tryCompareFunction(function() { return loader.item != undefined; }, true);
171 compare(loader.item.objectName, "sliderMenu", "Should have created a slider menu");
171 compare(loader.item.objectName, "sliderMenu", "Should have created a slider menu");
172
172
173− compare(loader.item.text, data.label, "Label does not match data");
173+ compare(loader.item.text, data.tag, "Label does not match data");
174 compare(loader.item.minIcon, "file:///testMinIcon", "MinIcon does not match data");
174 compare(loader.item.minIcon, "file:///testMinIcon", "MinIcon does not match data");
175 compare(loader.item.maxIcon, "file:///testMaxIcon", "MaxIcon does not match data");
175 compare(loader.item.maxIcon, "file:///testMaxIcon", "MaxIcon does not match data");
176 compare(loader.item.minimumValue, data.minValue, "MinValue does not match data");
176 compare(loader.item.minimumValue, data.minValue, "MinValue does not match data");
177 compare(loader.item.maximumValue, data.maxValue, "MaxValue does not match data");
177 compare(loader.item.maximumValue, data.maxValue, "MaxValue does not match data");
178− compare(loader.item.value, data.value, "Value does not match data");
179 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
178 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
179+ compare(loader.item.value, data.value1, "Value does not match data");
180+
181+ menuData.actionState = data.value2;
182+ compare(loader.item.value, data.value2, "Value does not match new data");
183+ }
184+
185+ function test_create_sliderMenu_lp1283191_data() {
186+ return [
187+ {tag: "disabled", enabled: false, minValue: 0, maxValue: 100, value1: 10.5, value2: 22, manualValue: 0 },
188+ {tag: "enabled", enabled: true, minValue: 0, maxValue: 100, value1: 100, value2: 50, manualValue: 30 },
189+ {tag: "test-zero", enabled: true, minValue: 0, maxValue: 100, value1: 10, value2: 0, manualValue: 20 },
190+ ];
191+ }
192+
193+ function test_create_sliderMenu_lp1283191(data) {
194+ menuData.type = "com.canonical.indicator.slider"
195+ menuData.label = data.tag;
196+ menuData.sensitive = data.enabled;
197+ menuData.ext = {
198+ 'minIcon': "file:///testMinIcon",
199+ 'maxIcon': "file:///testMaxIcon",
200+ 'minValue': data.minValue,
201+ 'maxValue': data.maxValue
202+ };
203+ menuData.actionState = data.value1;
204+
205+ loader.data = menuData;
206+ loader.sourceComponent = factory.load(menuData);
207+ tryCompareFunction(function() { return loader.item != undefined; }, true);
208+ compare(loader.item.value, data.value1, "Value does not match data");
209+
210+ var slider = findChild(loader.item, "slider");
211+ verify(slider !== null);
212+
213+ slider.value = data.manualValue;
214+ compare(loader.item.value, data.manualValue, "Slider value does not match manual set value");
215+
216+ menuData.actionState = data.value2;
217+ compare(loader.item.value, data.value2, "Value does not match new data");
218+
219+ menuData.actionState = undefined;
220+ compare(loader.item.value, data.value2, "Undefined state should not update slider value");
180 }
221 }
181
222
182 function test_create_buttonMenu_data() {
223 function test_create_buttonMenu_data() {