Skip to content

Commit dfe6484

Browse files
(v2) Scene editor: fix scale-based properties.
1 parent 5db83fe commit dfe6484

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

source/v2/phasereditor/phasereditor.scene.ui/src/phasereditor/scene/ui/editor/properties/FlipSection.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public boolean canEdit(Object obj) {
5050
return obj instanceof FlipComponent;
5151
}
5252

53-
@SuppressWarnings("unused")
5453
@Override
5554
public Control createContent(Composite parent) {
5655
Composite comp = new Composite(parent, SWT.NONE);

source/v2/phasereditor/phasereditor.ui/src/phasereditor/ui/properties/FormPropertySection.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ class ScaleListener extends MouseAdapter implements SelectionListener {
292292
public ScaleListener(Consumer<Float> listener) {
293293
super();
294294
_listener = listener;
295+
_initial = -1;
295296
}
296297

297298
@Override
@@ -301,16 +302,20 @@ public void widgetSelected(SelectionEvent e) {
301302

302303
@Override
303304
public void widgetDefaultSelected(SelectionEvent e) {
304-
//
305+
_initial = ((Scale) e.widget).getSelection();
305306
}
306307

307308
@Override
308309
public void mouseDown(MouseEvent e) {
309-
_initial = ((Scale) e.widget).getSelection();
310+
//
310311
}
311312

312313
@Override
313314
public void mouseUp(MouseEvent e) {
315+
applyValue();
316+
}
317+
318+
private void applyValue() {
314319
if (_value != _initial) {
315320
_initial = _value;
316321
_listener.accept((float) _value / 100);
@@ -320,10 +325,12 @@ public void mouseUp(MouseEvent e) {
320325
}
321326

322327
protected void listenFloat(Scale scale, Consumer<Float> listener) {
323-
var oldListener = scale.getData("-prop-listener");
328+
@SuppressWarnings("unchecked")
329+
var oldListener = (ScaleListener) scale.getData("-prop-listener");
324330

325331
if (oldListener != null) {
326-
scale.removeSelectionListener((SelectionListener) oldListener);
332+
scale.removeSelectionListener(oldListener);
333+
scale.removeMouseListener(oldListener);
327334
}
328335

329336
var scaleListener = new ScaleListener(listener);

0 commit comments

Comments
 (0)