Fix lighttouched

Normand Briere

2019-10-04 57c5b6cd8d12ffdaa3e0b099451e3c031012750a

 SwitchEditor.java
..
..
@@ -4,9 +4,14 @@
4
4
 import javax.swing.*;
5
5
 import javax.swing.event.*;
6
6
 
7
+import grafeme.ui.*;
8
+
7
9
 class SwitchEditor extends ObjEditor implements //ItemListener,
8
10
         ChangeListener, ObjectUI, ActionListener
9
11
 {
12
+    private cGridBag dampPanel;
13
+    private cGridBag framePanel;
14
+    
10
15
     SwitchEditor(SwitchNode inBP, GroupEditor callee)
11
16
     {
12
17
         super(inBP,callee);
..
..
@@ -67,6 +72,7 @@
67
72
 		oe.aConstraints.gridwidth = 1;
68
73
              */
69
74
             super.SetupUI2(oe);
75
+        framePanel = AddSlider(oe.ctrlPanel, "Child: ", 0, switchnode.getNumFrames()-1, switchnode.child);
70
76
                 
71
77
 //		oe.aConstraints.gridx = 0;
72
78
 //		oe.aConstraints.gridwidth = 1;
..
..
@@ -79,11 +85,12 @@
79
85
 //        
80
86
 //        frameField.setInteger(frameselect.child);
81
87
             
82
-            frameField = AddSlider(oe.ctrlPanel, "Child: ", 0, switchnode.getNumFrames()-1, switchnode.child);
83
-            Return();
88
+            frameField = (cNumberSlider)framePanel.getComponent(1);
89
+        oe.ctrlPanel.Return();
90
+        dampPanel = AddSlider(oe.ctrlPanel, "Damp: ", 0, 300, switchnode.speed);
84
91
             
85
-            speedField = AddSlider(oe.ctrlPanel, "Damp: ", 0, 500, switchnode.speed);
86
-            Return();
92
+            speedField = (cNumberSlider)dampPanel.getComponent(1);
93
+        oe.ctrlPanel.Return();
87
94
             
88
95
 //		oe.aConstraints.gridy += 1;
89
96
 //        
..
..
@@ -207,6 +214,8 @@
207
214
         switchnode.speed = speedField.getInteger(); // biparam.minUDivs, 99);
208
215
         //biparam.name = nameField.getText();
209
216
         
217
+        Globals.lighttouched = true;
218
+        
210
219
 // june 2013		super.applySelf();
211
220
         if (switchnode.speed != s)
212
221
             System.out.println("Damp = " + switchnode.speed);
..
..
@@ -222,8 +231,11 @@
222
231
 	//	oe.ctrlPanel.remove(frameLabel);
223
232
 	//	oe.ctrlPanel.remove(speedField);
224
233
 	//	oe.ctrlPanel.remove(speedLabel);
225
-                Remove(frameField);
226
-                Remove(speedField);
234
+//                Remove(frameField);
235
+//                Remove(speedField);
236
+                
237
+		oe.ctrlPanel.remove(framePanel);
238
+		oe.ctrlPanel.remove(dampPanel);
227
239
 		//oe.ctrlPanel.repaint();
228
240
                 
229
241
                 super.closeUI();
..
..
@@ -241,9 +253,9 @@
241
253
 	
242
254
     SwitchNode switchnode;
243
255
 //    JLabel frameLabel;
244
-    NumberSlider frameField;
256
+    cNumberSlider frameField;
245
257
 //    JLabel speedLabel;
246
-    NumberSlider speedField;
258
+    cNumberSlider speedField;
247
259
 
248
260
 	ObjectUI parent;
249
261