diff --git a/apps/browser/src/java/xj3d/browser/Xj3DBrowser.java b/apps/browser/src/java/xj3d/browser/Xj3DBrowser.java
index 7273eef8d23fe6e8a89f910dc44c5930f8b431c7..4cd6acaf77d5651a4693c309485c0e84164e1fa2 100644
--- a/apps/browser/src/java/xj3d/browser/Xj3DBrowser.java
+++ b/apps/browser/src/java/xj3d/browser/Xj3DBrowser.java
@@ -307,13 +307,17 @@ public class Xj3DBrowser extends JFrame
viewpointManager = setupAviatrix();
- int width = 800;
- int height = 600;
+ // preferred screen size 16:9 HD aspect ratio
+ // https://www.aspectratiocalculator.com/16-9.html
+ int screenWidth = 1024; // 800;
+ int screenHeight = 576; // 600;
+
+ screenWidth *= 0.9; // approximation to adjust width to account for interface at top and bottom
if (screenSize != null) {
// TODO: Bah, wish I knew how to get these window dressing params
- width = screenSize[0] + 8;
- height = screenSize[1] + 141;
+ screenWidth = screenSize[0] + 8;
+ screenHeight = screenSize[1] + 141;
}
GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
@@ -327,13 +331,13 @@ public class Xj3DBrowser extends JFrame
dev = env.getDefaultScreenDevice();
Dimension dmn = Toolkit.getDefaultToolkit().getScreenSize();
- width = (int) dmn.getWidth();
- height = (int) dmn.getHeight();
+ screenWidth = (int) dmn.getWidth();
+ screenHeight = (int) dmn.getHeight();
} else {
dev = gs[fullscreen];
DisplayMode dm = dev.getDisplayMode();
- width = dm.getWidth();
- height = dm.getHeight();
+ screenWidth = dm.getWidth();
+ screenHeight = dm.getHeight();
}
} else {
dev = env.getDefaultScreenDevice();
@@ -350,8 +354,8 @@ public class Xj3DBrowser extends JFrame
if(useFullscreen) {
DisplayMode currentMode = dev.getDisplayMode();
DisplayMode prefDisplayMode =
- new DisplayMode(width,
- height,
+ new DisplayMode(screenWidth,
+ screenHeight,
currentMode.getBitDepth(),
DisplayMode.REFRESH_RATE_UNKNOWN);
@@ -379,9 +383,9 @@ public class Xj3DBrowser extends JFrame
if (icon != null)
setIconImage(icon.getImage());
- Dimension dim = new Dimension(width, height);
+ Dimension screenDimension = new Dimension(screenWidth, screenHeight);
- setPreferredSize(dim);
+ setPreferredSize(screenDimension);
if (!useFullscreen && screenSize == null) {
setLocation(40, 40);
@@ -391,7 +395,7 @@ public class Xj3DBrowser extends JFrame
if (!useJoglNewt)
pack();
else
- setMinimumSize(dim);
+ setMinimumSize(screenDimension);
Runnable run = () -> {
setVisible(true);
diff --git a/src/java/org/web3d/util/Xj3dVersionInformation.java b/src/java/org/web3d/util/Xj3dVersionInformation.java
index 8a92a81bbba6e2729a491465c3e2fb460caa41b8..45806c00c9f83d308e6a99af99c5c3187cac814d 100644
--- a/src/java/org/web3d/util/Xj3dVersionInformation.java
+++ b/src/java/org/web3d/util/Xj3dVersionInformation.java
@@ -73,8 +73,10 @@ public class Xj3dVersionInformation {
public static String JOGL_VERSION;
// https://docs.oracle.com/javase/tutorial/essential/environment/sysprop.html
- public static final String OS_JAVA_VERSION_MESSAGE = " Operating system: " + System.getProperty("os.name") + SP + System.getProperty("os.version") + "\n" +
- " Java environment: " + System.getProperty("java.vendor") + SP + JAVA_VERSION;
+ // https://stackoverflow.com/questions/5103121/how-to-find-the-jvm-version-from-a-program
+ // https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/System.html#getProperties()
+ public static final String OS_JAVA_VERSION_MESSAGE = " Operating system: " + System.getProperty("os.name") + SP + System.getProperty("os.version") + "\n" +
+ " Java environment: " + System.getProperty("java.runtime.name") + SP + JAVA_VERSION;
/**
* The release version, must first be initialized by class constructor. Milestone format will be
* <code>M<i>MainVersion</i>_<i>DevRelease#</i></code>
diff --git a/src/java/org/web3d/vrml/sav/InputSource.java b/src/java/org/web3d/vrml/sav/InputSource.java
index 673a3e41b413082aff4a6c44849a87bc213f7e32..bd3d790c71e98ebcb46beb8edd720e485d5df7b8 100644
--- a/src/java/org/web3d/vrml/sav/InputSource.java
+++ b/src/java/org/web3d/vrml/sav/InputSource.java
@@ -185,8 +185,8 @@ public class InputSource {
String[] stripped_file = URIUtils.stripFile(URLDecoder.decode(realURL, "UTF-8"));
String path = stripped_file[0];
- System.out.println("InputSource: extractBaseUrl():"); // paths can be long for console
- System.out.println(" " + path);
+// System.out.println("[InputSource] extractBaseUrl():"); // paths can be long for console
+// System.out.println(" " + path);
// Would this really work? What if the uri is a URN?
int index = path.lastIndexOf("/");
diff --git a/src/java/org/xj3d/ui/awt/widgets/SwingConsoleWindow.java b/src/java/org/xj3d/ui/awt/widgets/SwingConsoleWindow.java
index 2fd8a35706052eeb4a1e9e7b5bc3516f4bed5892..6181b6d48e9dda41b45d48f9d94cc7ad06b2f7c6 100644
--- a/src/java/org/xj3d/ui/awt/widgets/SwingConsoleWindow.java
+++ b/src/java/org/xj3d/ui/awt/widgets/SwingConsoleWindow.java
@@ -125,7 +125,7 @@ public class SwingConsoleWindow extends JFrame
p1.add(issuesButton);
else System.out.println("Unable to support issues button, this installation does not support Java Desktop");
- setSize(800, 600); // wide enough for typical paths
+ setSize(720, 560); // wide enough for typical paths
setLocation(80, 80);
setDefaultCloseOperation(HIDE_ON_CLOSE);
diff --git a/src/java/org/xj3d/ui/awt/widgets/SwingLocationToolbar.java b/src/java/org/xj3d/ui/awt/widgets/SwingLocationToolbar.java
index 872f4e86070a5c86b65fd60bc512614f784a7b99..5be70b7086945262457c4f7287ba594f611ffe2b 100644
--- a/src/java/org/xj3d/ui/awt/widgets/SwingLocationToolbar.java
+++ b/src/java/org/xj3d/ui/awt/widgets/SwingLocationToolbar.java
@@ -412,7 +412,7 @@ public class SwingLocationToolbar extends JPanel
String url_str;
- errorReporter.messageReport("==================================================\n" + "Loading: " + url);
+ errorReporter.messageReport("==================================================\n" + "Loading:\n " + url);
// try a file first
File f = new File(url);