From 1af7d3700724834e40ad8636bc9a56cdc3b19b15 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 27 Jul 2019 11:52:38 -0400
Subject: [PATCH] New layout icons

---
 SwitchEditor.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/SwitchEditor.java b/SwitchEditor.java
index 5b02a63..19f7e34 100644
--- a/SwitchEditor.java
+++ b/SwitchEditor.java
@@ -4,9 +4,13 @@
 import javax.swing.*;
 import javax.swing.event.*;
 
+import grafeme.ui.*;
+
 class SwitchEditor extends ObjEditor implements //ItemListener,
         ChangeListener, ObjectUI, ActionListener
 {
+    private cGridBag dampPanel;
+    private cGridBag framePanel;
     SwitchEditor(SwitchNode inBP, GroupEditor callee)
     {
         super(inBP,callee);
@@ -67,6 +71,7 @@
 		oe.aConstraints.gridwidth = 1;
              */
             super.SetupUI2(oe);
+        framePanel = AddSlider(oe.ctrlPanel, "Child: ", 0, switchnode.getNumFrames()-1, switchnode.child);
                 
 //		oe.aConstraints.gridx = 0;
 //		oe.aConstraints.gridwidth = 1;
@@ -79,11 +84,12 @@
 //        
 //        frameField.setInteger(frameselect.child);
             
-            frameField = AddSlider(oe.ctrlPanel, "Child: ", 0, switchnode.getNumFrames()-1, switchnode.child);
-            Return();
+            frameField = (cNumberSlider)framePanel.getComponent(1);
+        oe.ctrlPanel.Return();
+        dampPanel = AddSlider(oe.ctrlPanel, "Damp: ", 0, 500, switchnode.speed);
             
-            speedField = AddSlider(oe.ctrlPanel, "Damp: ", 0, 500, switchnode.speed);
-            Return();
+            speedField = (cNumberSlider)dampPanel.getComponent(1);
+        oe.ctrlPanel.Return();
             
 //		oe.aConstraints.gridy += 1;
 //        
@@ -222,8 +228,11 @@
 	//	oe.ctrlPanel.remove(frameLabel);
 	//	oe.ctrlPanel.remove(speedField);
 	//	oe.ctrlPanel.remove(speedLabel);
-                Remove(frameField);
-                Remove(speedField);
+//                Remove(frameField);
+//                Remove(speedField);
+                
+		oe.ctrlPanel.remove(framePanel);
+		oe.ctrlPanel.remove(dampPanel);
 		//oe.ctrlPanel.repaint();
                 
                 super.closeUI();
@@ -241,9 +250,9 @@
 	
     SwitchNode switchnode;
 //    JLabel frameLabel;
-    NumberSlider frameField;
+    cNumberSlider frameField;
 //    JLabel speedLabel;
-    NumberSlider speedField;
+    cNumberSlider speedField;
 
 	ObjectUI parent;
 	

--
Gitblit v1.6.2