From 59de607850161a26863f92961d53caae7a2dabc8 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 06 Aug 2019 21:37:03 -0400
Subject: [PATCH] Pin button.
---
ObjEditor.java | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index b86325c..8e14d77 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -34,6 +34,7 @@
iSendInfo
//KeyListener
{
+ public cToggleButton pinButton;
boolean timeline;
boolean wasFullScreen;
@@ -466,6 +467,8 @@
toolboxPanel = new cGridBag().setVertical(true);
//toolboxPanel.setName("Toolbox");
+
+ skyboxPanel = new cGridBag().setVertical(true);
materialPanel = new cGridBag().setVertical(false);
//materialPanel.setName("Material");
@@ -1205,6 +1208,18 @@
namePanel = new cGridBag();
+ //if (copy.pinned)
+ {
+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
+ pinButton.setSelected(copy.pinned);
+ cGridBag t = new cGridBag();
+ t.preferredWidth = 2;
+ t.add(pinButton);
+ namePanel.add(t);
+
+ pinButton.addItemListener(this);
+ }
+
nameField = AddText(namePanel, copy.GetName());
namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
oe.ctrlPanel.add(namePanel);
@@ -1556,27 +1571,26 @@
objectPanel.setIconAt(0, GetIcon("icons/material.png"));
objectPanel.setToolTipTextAt(0, "Material");
+ objectPanel.add(toolboxPanel);
+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
+
+ objectPanel.add(skyboxPanel);
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
+
// JPanel north = new JPanel(new BorderLayout());
// north.setName("Edit");
// north.add(ctrlPanel, BorderLayout.NORTH);
// objectPanel.add(north);
objectPanel.add(editPanel);
- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
- objectPanel.setToolTipTextAt(1, "Edit controls");
-
- //if (Globals.ADVANCED)
- objectPanel.add(infoPanel);
- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
- objectPanel.setToolTipTextAt(2, "Information");
+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
+ objectPanel.setToolTipTextAt(3, "Edit controls");
objectPanel.add(XYZPanel);
- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
- objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
- objectPanel.add(toolboxPanel);
- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
- objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
-
/*
aConstraints.gridx = 0;
aConstraints.gridwidth = 1;
@@ -1613,6 +1627,11 @@
scenePanel.add(tabbedPane);
+ //if (Globals.ADVANCED)
+ tabbedPane.add(infoPanel);
+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
+ tabbedPane.setToolTipTextAt(3, "Information");
+
/*
cTree jTree = new cTree(null);
ToolTipManager.sharedInstance().registerComponent(jTree);
@@ -3574,6 +3593,17 @@
public void itemStateChanged(ItemEvent event)
{
// System.out.println("Propagate = " + propagate);
+ if (event.getSource() == pinButton)
+ {
+ copy.pinned ^= true;
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
+ {
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
+ copy.CloseUI();
+ //copy.editWindow.refreshContents();
+ }
+ }
+ else
if (event.getSource() == propagateToggle)
{
propagate ^= true;
@@ -5747,6 +5777,7 @@
ButtonGroup buttonGroup;
cGridBag toolboxPanel;
+ cGridBag skyboxPanel;
cGridBag materialPanel;
cGridBag ctrlPanel;
--
Gitblit v1.6.2