From c7a87513d3dbbf482dff3fa20dfa606891f0f23f Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 23 Dec 2024 17:42:45 +0000
Subject: [PATCH] Various fixes [stage]

---
 .../app/beacon/impl/DaemonOpenExchangeImpl.java      | 12 ++++++++----
 .../io/xpipe/app/comp/base/ModalOverlayComp.java     |  5 +++--
 .../java/io/xpipe/app/issue/ErrorDetailsComp.java    |  2 +-
 .../java/io/xpipe/app/issue/ErrorHandlerComp.java    |  1 +
 .../main/java/io/xpipe/app/util/PlatformInit.java    |  3 +++
 .../xpipe/app/resources/style/error-handler-comp.css |  1 -
 version                                              |  2 +-
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/DaemonOpenExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/DaemonOpenExchangeImpl.java
index 75f9e4b7f..7a300a9ef 100644
--- a/app/src/main/java/io/xpipe/app/beacon/impl/DaemonOpenExchangeImpl.java
+++ b/app/src/main/java/io/xpipe/app/beacon/impl/DaemonOpenExchangeImpl.java
@@ -2,6 +2,7 @@ package io.xpipe.app.beacon.impl;
 
 import io.xpipe.app.core.launcher.LauncherInput;
 import io.xpipe.app.core.mode.OperationMode;
+import io.xpipe.app.util.PlatformInit;
 import io.xpipe.app.util.PlatformState;
 import io.xpipe.beacon.BeaconServerException;
 import io.xpipe.beacon.api.DaemonOpenExchange;
@@ -13,12 +14,15 @@ public class DaemonOpenExchangeImpl extends DaemonOpenExchange {
     @Override
     public Object handle(HttpExchange exchange, Request msg) throws BeaconServerException {
         if (msg.getArguments().isEmpty()) {
-            if (!OperationMode.switchToSyncIfPossible(OperationMode.GUI)) {
-                throw new BeaconServerException(PlatformState.getLastError());
+            var err = PlatformInit.getError();
+            if (err != null) {
+                throw new BeaconServerException(err);
             }
-        }
 
-        LauncherInput.handle(msg.getArguments());
+            OperationMode.switchToAsync(OperationMode.GUI);
+        } else {
+            LauncherInput.handle(msg.getArguments());
+        }
         return Response.builder().build();
     }
 
diff --git a/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java b/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java
index 3071f63a6..f425a131f 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java
@@ -7,6 +7,7 @@ import io.xpipe.app.core.AppFont;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.util.PlatformThread;
 
+import io.xpipe.core.process.OsType;
 import javafx.animation.*;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
@@ -44,8 +45,8 @@ public class ModalOverlayComp extends SimpleComp {
     protected Region createSimple() {
         var bgRegion = background.createRegion();
         var modal = new ModalPane();
-        modal.setInTransitionFactory(node -> fadeInDelyed(node));
-        modal.setOutTransitionFactory(node -> Animations.fadeOut(node, Duration.millis(200)));
+        modal.setInTransitionFactory(OsType.getLocal() == OsType.LINUX ? null : node -> fadeInDelyed(node));
+        modal.setOutTransitionFactory(OsType.getLocal() == OsType.LINUX ? null : node -> Animations.fadeOut(node, Duration.millis(200)));
         modal.focusedProperty().addListener((observable, oldValue, newValue) -> {
             var c = modal.getContent();
             if (newValue && c != null) {
diff --git a/app/src/main/java/io/xpipe/app/issue/ErrorDetailsComp.java b/app/src/main/java/io/xpipe/app/issue/ErrorDetailsComp.java
index e4794f2a3..1a1e49507 100644
--- a/app/src/main/java/io/xpipe/app/issue/ErrorDetailsComp.java
+++ b/app/src/main/java/io/xpipe/app/issue/ErrorDetailsComp.java
@@ -24,7 +24,7 @@ public class ErrorDetailsComp extends SimpleComp {
             AppFont.verySmall(tf);
             tf.setWrapText(false);
             tf.setEditable(false);
-            tf.setPadding(new Insets(10));
+            tf.setPadding(new Insets(10, 0, 10, 0));
             return tf;
         }
 
diff --git a/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java b/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java
index 8230d99a8..112d05471 100644
--- a/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java
+++ b/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java
@@ -171,6 +171,7 @@ public class ErrorHandlerComp extends SimpleComp {
         if (event.getThrowable() != null) {
             content.getChildren().add(new Separator(Orientation.HORIZONTAL));
             var details = createDetails();
+            AppFont.medium(details);
             layout.setBottom(details);
         }
 
diff --git a/app/src/main/java/io/xpipe/app/util/PlatformInit.java b/app/src/main/java/io/xpipe/app/util/PlatformInit.java
index cde0fe911..3bfdd6578 100644
--- a/app/src/main/java/io/xpipe/app/util/PlatformInit.java
+++ b/app/src/main/java/io/xpipe/app/util/PlatformInit.java
@@ -8,6 +8,7 @@ import io.xpipe.core.process.OsType;
 
 import javafx.application.Application;
 
+import lombok.Getter;
 import lombok.SneakyThrows;
 
 import java.util.concurrent.CountDownLatch;
@@ -16,6 +17,8 @@ public class PlatformInit {
 
     private static final CountDownLatch latch = new CountDownLatch(2);
     private static Thread loadingThread;
+
+    @Getter
     private static Throwable error;
 
     @SneakyThrows
diff --git a/app/src/main/resources/io/xpipe/app/resources/style/error-handler-comp.css b/app/src/main/resources/io/xpipe/app/resources/style/error-handler-comp.css
index 678da3b25..bb83561b3 100644
--- a/app/src/main/resources/io/xpipe/app/resources/style/error-handler-comp.css
+++ b/app/src/main/resources/io/xpipe/app/resources/style/error-handler-comp.css
@@ -7,7 +7,6 @@
 }
 
 .error-handler-comp .details {
-    -fx-padding: 0 1.5em 1.0em 1.5em;
     -fx-background-color: transparent;
 }
 
diff --git a/version b/version
index a2a9fa70e..0ab90e618 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-14.0-16
+14.0-17