From 7d02eaffc02895a01d95d8fd7e089044449e1d6d Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Thu, 01 Aug 2019 00:20:19 -0400
Subject: [PATCH] Switch left/right
---
BoundaryRep.java | 2 +-
GroupEditor.java | 12 +++++++-----
Grafreed.java | 4 ++--
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/BoundaryRep.java b/BoundaryRep.java
index 61337fb..79ff6fe 100644
--- a/BoundaryRep.java
+++ b/BoundaryRep.java
@@ -1997,7 +1997,7 @@
if (v.vertexlinks == null)
continue;
- // Warning: a bit faster but dangerous
+ // Warning: faster but dangerous
if (v.weights != null && v.weights[j]
// == 0)
< 0.001 * v.totalweight)
diff --git a/Grafreed.java b/Grafreed.java
index 4f0341c..7007edf 100644
--- a/Grafreed.java
+++ b/Grafreed.java
@@ -626,12 +626,12 @@
System.out.println("jarfile = " + jarfile);
- String command = javaPath + " -Xmx2048m -Djava.library.path=" + jarpath;
+ String command = javaPath + " -Xmx1024m -Djava.library.path=" + jarpath;
// -Djava.library.path=/Users/nbriere/Projects/shared/lib
if (jarfile.charAt(2) == ':')
{
- command = "\"" + javaPath + "\" -Xmx2048m -Djava.library.path=" + jarpath;
+ command = "\"" + javaPath + "\" -Xmx1024m -Djava.library.path=" + jarpath;
// On Windows systems, the path is /C:/
jarfile = jarfile.substring(1, jarfile.length());
System.out.println("jarfile = " + jarfile);
diff --git a/GroupEditor.java b/GroupEditor.java
index f72277a..7ec82e1 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -932,7 +932,7 @@
restoreCameraButton.addActionListener(this);
copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- saveButton.setToolTipText("New version");
+ saveButton.setToolTipText("Duplicate current version");
saveButton.addActionListener(this);
copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
@@ -942,12 +942,12 @@
cGridBag updown = new cGridBag().setVertical(true);
updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- restoreButton.setToolTipText("Restore current");
+ restoreButton.setToolTipText("Restore current version (undo latest change)");
restoreButton.addActionListener(this);
restoreButton.setEnabled(false);
updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- replaceButton.setToolTipText("Replace current");
+ replaceButton.setToolTipText("Replace current version (save latest change)");
replaceButton.addActionListener(this);
replaceButton.setEnabled(false);
@@ -1183,7 +1183,7 @@
dgr.addDragGestureListener(this);
}catch(Exception e) {}
*/
- radio.layout = sixButton; // sevenButton;
+ radio.layout = threeButton; // sixButton;
oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
}
@@ -1328,7 +1328,7 @@
}
radioButton.SetObject(obj);
- radioButton.layout = sixButton; // sevenButton;
+ radioButton.layout = threeButton; // sixButton;
radioButton.SetCamera(cameraView.renderCamera, false);
radioButton.addActionListener(this);
radioPanel.add(radioButton);
@@ -3944,11 +3944,13 @@
} else if (event.getSource() == editCameraItem)
{
cameraView.ProtectCamera();
+ cameraView.requestFocusInWindow();
cameraView.repaint();
return;
} else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
{
cameraView.RevertCamera();
+ cameraView.requestFocusInWindow();
cameraView.repaint();
return;
// } else if (event.getSource() == textureButton)
--
Gitblit v1.6.2