From e87681b3f907690a2aeefd4b88de058caed7fdc4 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 25 Apr 2020 09:53:29 +0200
Subject: [PATCH] Various improvements to Mini Desktop after testing on
 Windows.

---
 .../argeo/minidesktop/MiniDesktopManager.java    | 12 ++++++------
 .../src/org/argeo/minidesktop/MiniHomePart.java  | 16 ++++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/rcp/org.argeo.minidesktop/src/org/argeo/minidesktop/MiniDesktopManager.java b/rcp/org.argeo.minidesktop/src/org/argeo/minidesktop/MiniDesktopManager.java
index ba2e48032..4d7c03c62 100644
--- a/rcp/org.argeo.minidesktop/src/org/argeo/minidesktop/MiniDesktopManager.java
+++ b/rcp/org.argeo.minidesktop/src/org/argeo/minidesktop/MiniDesktopManager.java
@@ -64,6 +64,7 @@ public class MiniDesktopManager {
 			rootShell = new Shell(display, SWT.NO_TRIM);
 			rootShell.setFullScreen(true);
 			Rectangle bounds = display.getBounds();
+			rootShell.setLocation(0, 0);
 			rootShell.setSize(bounds.width, bounds.height);
 		} else {
 			rootShell = new Shell(display, SWT.CLOSE | SWT.RESIZE);
@@ -106,17 +107,15 @@ public class MiniDesktopManager {
 			homeTabItem.setControl(background);
 			tabFolder.setFocus();
 		} else {
-			if (isFullscreen())
-				createBackground(rootShell);
-			else
-				rootShell.pack();
+			createBackground(rootShell);
 		}
 
 		rootShell.open();
 		// rootShell.layout(true, true);
 
 		if (toolBarShell != null) {
-			toolBarShell.setLocation(new Point(0, 0));
+			int toolBarShellY = (display.getBounds().height - toolBar.getSize().y) / 2;
+			toolBarShell.setLocation(0, toolBarShellY);
 			toolBarShell.open();
 		}
 	}
@@ -224,7 +223,8 @@ public class MiniDesktopManager {
 			item.setControl(appParent);
 			return new AppContext(item);
 		} else {
-			Shell shell = new Shell(rootShell.getDisplay(), SWT.SHELL_TRIM);
+			Shell shell = isFullscreen() ? new Shell(rootShell, SWT.SHELL_TRIM)
+					: new Shell(rootShell.getDisplay(), SWT.SHELL_TRIM);
 			shell.setImage(icon);
 			return new AppContext(shell);
 		}
diff --git a/rcp/org.argeo.minidesktop/src/org/argeo/minidesktop/MiniHomePart.java b/rcp/org.argeo.minidesktop/src/org/argeo/minidesktop/MiniHomePart.java
index b2ee6c1bc..877f64384 100644
--- a/rcp/org.argeo.minidesktop/src/org/argeo/minidesktop/MiniHomePart.java
+++ b/rcp/org.argeo.minidesktop/src/org/argeo/minidesktop/MiniHomePart.java
@@ -58,16 +58,20 @@ public class MiniHomePart {
 		if (netInterfaces != null)
 			while (netInterfaces.hasMoreElements()) {
 				NetworkInterface netInterface = netInterfaces.nextElement();
+				byte[] hardwareAddress = null;
 				try {
-					label(hostGroup, convertHardwareAddress(netInterface.getHardwareAddress()));
+					hardwareAddress = netInterface.getHardwareAddress();
+					if (hardwareAddress != null) {
+						label(hostGroup, convertHardwareAddress(hardwareAddress));
+						label(hostGroup, netInterface.getName());
+						for (InterfaceAddress addr : netInterface.getInterfaceAddresses()) {
+							label(hostGroup, cleanHostAddress(addr.getAddress().getHostAddress()));
+							label(hostGroup, Short.toString(addr.getNetworkPrefixLength()));
+						}
+					}
 				} catch (SocketException e) {
 					label(hostGroup, e.getMessage());
 				}
-				label(hostGroup, netInterface.getName());
-				for (InterfaceAddress addr : netInterface.getInterfaceAddresses()) {
-					label(hostGroup, cleanHostAddress(addr.getAddress().getHostAddress()));
-					label(hostGroup, Short.toString(addr.getNetworkPrefixLength()));
-				}
 			}
 
 		// Resources
-- 
2.39.2