patrickbindelli
diff --git a/‎release/openfin-desktop-java-adapter-7.1.1-SNAPSHOT.jar‎
235 Bytes b/‎release/openfin-desktop-java-adapter-7.1.1-SNAPSHOT.jar‎
235 Bytes
diff --git a/‎release/openfin-desktop-java-example-7.1.1.jar‎
-1015 Bytes b/‎release/openfin-desktop-java-example-7.1.1.jar‎
-1015 Bytes
diff --git a/‎src/main/java/com/openfin/desktop/demo/FxLayoutFrame.java‎
Lines changed: 3 additions & 6 deletions b/‎src/main/java/com/openfin/desktop/demo/FxLayoutFrame.java‎
Lines changed: 3 additions & 6 deletions
diff --git a/‎src/main/java/com/openfin/desktop/demo/LayoutFrame.java‎
Lines changed: 4 additions & 18 deletions b/‎src/main/java/com/openfin/desktop/demo/LayoutFrame.java‎
Lines changed: 4 additions & 18 deletions
@@ -26,6 +26,7 @@ public FxLayoutFrame(DesktopConnection desktopConnection, String appUuid, String
         this.windowName = windowName;
         if (jFXPanel == null) {
           jFXPanel = new JFXPanel();
+            javafx.application.Platform.setImplicitExit(false);
         }
         javafx.application.Platform.runLater(new Runnable() {
             @Override
@@ -47,12 +48,8 @@ public void run() {
                 FxLayoutFrame.this.stage.setY(480);
                 FxLayoutFrame.this.stage.show();
 
-                FxLayoutFrame.this.stage.setOnCloseRequest(new EventHandler<WindowEvent>() {
-                    @Override
-                    public void handle(WindowEvent event) {
-                        FxLayoutFrame.this.cleanup();
-                    }
-                });
+//                FxLayoutFrame.this.stage.setOnCloseRequest(event -> FxLayoutFrame.this.cleanup());
+
                 try {
                     FxLayoutFrame.this.externalWindowObserver =
                         new ExternalWindowObserver(desktopConnection.getPort(), appUuid, windowName, FxLayoutFrame.this.stage,
 
@@ -10,7 +10,6 @@
 import com.openfin.desktop.channel.ChannelClient;
 import com.openfin.desktop.win32.ExternalWindowObserver;
 import com.sun.jna.Native;
-import com.sun.jna.platform.win32.User32;
 import com.sun.jna.platform.win32.WinDef;
 
 import org.json.JSONArray;
@@ -214,27 +213,14 @@ private void setHasFrame(JFrame frame, boolean hasFrame) {
 				@Override
 				public void run() {
 					System.out.println(windowName + " hasFrame=" + hasFrame);
-					
-					Dimension size = frame.getSize();
 					WinDef.HWND hWnd = new WinDef.HWND();
 					hWnd.setPointer(Native.getComponentPointer(frame));
-
-					int style = User32.INSTANCE.GetWindowLong(hWnd, User32.GWL_STYLE);
-
-					if (hasFrame) {
-						frame.setResizable(true);
-//						style = style & ~User32.WS_CHILD;
-						style = style | User32.WS_CAPTION | User32.WS_BORDER | User32.WS_THICKFRAME;
-					} else {
-						frame.setResizable(false);
-						style = style &~ User32.WS_CAPTION &~ User32.WS_BORDER &~ User32.WS_THICKFRAME;
-//						style = style | User32.WS_CHILD;
-					}
-					User32.INSTANCE.SetWindowLong(hWnd, User32.GWL_STYLE, style);
-					User32.INSTANCE.RedrawWindow(hWnd, null, null, new WinDef.DWORD((User32.RDW_FRAME | User32.RDW_INVALIDATE)));
-					frame.setSize(size.width, size.height + 1);
+					LayoutFrame.this.externalWindowObserver.setHasFrame(hWnd, hasFrame);
+					frame.setResizable(hasFrame);
 					frame.invalidate();
+					frame.validate();
 					frame.repaint();
+					SwingUtilities.updateComponentTreeUI(frame);
 				}
 			});
 		}