CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-07-08 15:56:09 +12:00
Code Issues Packages Projects Releases Wiki Activity

More macOS integration fixes

Browse source
This commit is contained in:
crschnick 2023-02-12 21:57:50 +00:00
parent ccce77a648
commit 0a7741cb8c
3 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/io/xpipe/app/core/AppWindowHelper.java
View file

@ -74,6 +74,15 @@ public class AppWindowHelper {
childStage.setY(stage.getY() + stage.getHeight() / 2 - childStage.getHeight() / 2);
}
public static void showAlert(Alert a, Consumer<Optional<ButtonType>> bt) {
ThreadHelper.runAsync(() -> {
var r = showBlockingAlert(a);
if (bt != null) {
bt.accept(r);
}
});
}
public static void showAlert(Consumer<Alert> c, Consumer<Optional<ButtonType>> bt) {
ThreadHelper.runAsync(() -> {
var r = showBlockingAlert(c);

27
app/src/main/java/io/xpipe/app/util/MacOsPermissions.java
View file

@ -8,20 +8,22 @@ import javafx.application.Platform;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.scene.control.Alert;
import java.util.concurrent.atomic.AtomicReference;
public class MacOsPermissions {
private static Alert createAlert() {
var alert = AppWindowHelper.createEmptyAlert();
alert.setAlertType(Alert.AlertType.CONFIRMATION);
alert.setAlertType(Alert.AlertType.INFORMATION);
alert.setTitle(I18n.get("permissionsAlertTitle"));
alert.setHeaderText(I18n.get("permissionsAlertTitleHeader"));
alert.getDialogPane().setContent(AppWindowHelper.alertContentText(I18n.get("permissionsAlertTitleContent")));
alert.setAlertType(Alert.AlertType.CONFIRMATION);
alert.getButtonTypes().clear();
return alert;
}
public static boolean waitForAccessibilityPermissions() throws Exception {
var alert = createAlert();
AtomicReference<Alert> alert = new AtomicReference<>();
var state = new SimpleBooleanProperty(true);
try (var pc = ShellStore.local().create().start()) {
while (state.get()) {
@ -29,17 +31,24 @@ public class MacOsPermissions {
"osascript -e 'tell application \"System Events\" to keystroke \"t\"'");
if (success) {
Platform.runLater(() -> {
alert.close();
if (alert.get() != null) {
alert.get().close();
}
});
return true;
} else {
Platform.runLater(() -> {
var result = AppWindowHelper.showBlockingAlert(alert)
.map(buttonType -> buttonType.getButtonData().isDefaultButton())
.orElse(false);
if (!result) {
state.set(false);
if (alert.get() != null) {
return;
}
alert.set(createAlert());
AppWindowHelper.showAlert(alert.get(), buttonType -> {
alert.get().close();
if (buttonType.isEmpty() || !buttonType.get().getButtonData().isDefaultButton()) {
state.set(false);
}
});
});
ThreadHelper.sleep(1000);
}

2
core/src/main/java/io/xpipe/core/process/ShellTypes.java
View file

@ -484,7 +484,7 @@ public class ShellTypes {
var content = "";
for (Map.Entry<String, String> e : variables.entrySet()) {
content += e.getKey() + "=\"" + e.getValue() + "\"";
content += getConcatenationOperator();
content += " ";
}
return content + command;
}