From 9391a397daac99e7564c3e1f5e69b84471762485 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Tue, 14 Nov 2023 14:29:28 +0200 Subject: [PATCH] set dialog minimum height to preferred height (or make resizable) to avoid window sizing bug in some linux environments --- src/main/java/com/sparrowwallet/sparrow/WelcomeDialog.java | 1 + .../java/com/sparrowwallet/sparrow/control/DeviceDialog.java | 1 + .../com/sparrowwallet/sparrow/control/MnemonicGridDialog.java | 1 + .../java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java | 2 ++ .../java/com/sparrowwallet/sparrow/control/QRScanDialog.java | 1 + .../com/sparrowwallet/sparrow/control/SendToManyDialog.java | 1 + .../java/com/sparrowwallet/sparrow/control/TextAreaDialog.java | 1 + .../com/sparrowwallet/sparrow/control/WalletExportDialog.java | 1 + .../com/sparrowwallet/sparrow/control/WalletImportDialog.java | 1 + .../com/sparrowwallet/sparrow/control/WalletSummaryDialog.java | 1 + .../sparrow/keystoreimport/KeystoreImportDialog.java | 1 + .../com/sparrowwallet/sparrow/paynym/PayNymAddressesDialog.java | 1 + .../java/com/sparrowwallet/sparrow/paynym/PayNymDialog.java | 1 + .../sparrowwallet/sparrow/preferences/PreferencesDialog.java | 1 + .../sparrowwallet/sparrow/preferences/ServerAliasDialog.java | 1 + .../com/sparrowwallet/sparrow/soroban/CounterpartyDialog.java | 1 + .../java/com/sparrowwallet/sparrow/soroban/InitiatorDialog.java | 1 + .../java/com/sparrowwallet/sparrow/wallet/AdvancedDialog.java | 1 + src/main/java/com/sparrowwallet/sparrow/wallet/MixToDialog.java | 1 + .../com/sparrowwallet/sparrow/wallet/MultisigBackupDialog.java | 1 + .../com/sparrowwallet/sparrow/whirlpool/WhirlpoolDialog.java | 1 + 21 files changed, 22 insertions(+) diff --git a/src/main/java/com/sparrowwallet/sparrow/WelcomeDialog.java b/src/main/java/com/sparrowwallet/sparrow/WelcomeDialog.java index 843e9ddd..3b2702a0 100644 --- a/src/main/java/com/sparrowwallet/sparrow/WelcomeDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/WelcomeDialog.java @@ -22,6 +22,7 @@ public class WelcomeDialog extends Dialog { dialogPane.setPrefWidth(600); dialogPane.setPrefHeight(520); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); dialogPane.getStylesheets().add(AppServices.class.getResource("welcome.css").toExternalForm()); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/DeviceDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/DeviceDialog.java index d201800b..a23e52a5 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/DeviceDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/DeviceDialog.java @@ -91,6 +91,7 @@ public abstract class DeviceDialog extends Dialog { dialogPane.setPrefWidth(500); dialogPane.setPrefHeight(360); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); setResultConverter(dialogButton -> dialogButton == cancelButtonType ? null : getResult()); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/MnemonicGridDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/MnemonicGridDialog.java index c3ca01ba..787baf5e 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/MnemonicGridDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/MnemonicGridDialog.java @@ -139,6 +139,7 @@ public class MnemonicGridDialog extends Dialog> { dialogPane.setPrefWidth(952); dialogPane.setPrefHeight(500); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.setStageIcon(dialogPane.getScene().getWindow()); AppServices.moveToActiveWindowScreen(this); } diff --git a/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java index ef00387c..52cecc17 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java @@ -109,6 +109,7 @@ public class QRDisplayDialog extends Dialog { dialogPane.setPrefWidth(40 + qrSize + 40); dialogPane.setPrefHeight(40 + qrSize + 85); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); setResultConverter(dialogButton -> dialogButton); @@ -143,6 +144,7 @@ public class QRDisplayDialog extends Dialog { dialogPane.setPrefWidth(40 + qrSize + 40); dialogPane.setPrefHeight(40 + qrSize + 85); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); setResultConverter(dialogButton -> dialogButton); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java index 45996aed..8022a7bf 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java @@ -173,6 +173,7 @@ public class QRScanDialog extends Dialog { dialogPane.getButtonTypes().addAll(hdButtonType, camButtonType, cancelButtonType); dialogPane.setPrefWidth(646); dialogPane.setPrefHeight(webcamResolutionProperty.get() == WebcamResolution.HD ? 490 : 590); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); setResultConverter(dialogButton -> dialogButton != cancelButtonType ? result : null); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/SendToManyDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/SendToManyDialog.java index ca484a8a..dccf4efa 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/SendToManyDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/SendToManyDialog.java @@ -81,6 +81,7 @@ public class SendToManyDialog extends Dialog> { dialogPane.setPrefWidth(850); dialogPane.setPrefHeight(500); + setResizable(true); AppServices.setStageIcon(dialogPane.getScene().getWindow()); AppServices.moveToActiveWindowScreen(this); } diff --git a/src/main/java/com/sparrowwallet/sparrow/control/TextAreaDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/TextAreaDialog.java index b5342f78..7aa63174 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/TextAreaDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/TextAreaDialog.java @@ -85,6 +85,7 @@ public class TextAreaDialog extends Dialog { dialogPane.setPrefWidth(700); dialogPane.setPrefHeight(400); + setResizable(true); AppServices.moveToActiveWindowScreen(this); } diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WalletExportDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/WalletExportDialog.java index d87feb3f..343cbb53 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WalletExportDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WalletExportDialog.java @@ -64,6 +64,7 @@ public class WalletExportDialog extends Dialog { dialogPane.getButtonTypes().addAll(cancelButtonType); dialogPane.setPrefWidth(500); dialogPane.setPrefHeight(480); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); setResultConverter(dialogButton -> dialogButton != cancelButtonType ? wallet : null); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java index 358388e3..a6056a59 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java @@ -90,6 +90,7 @@ public class WalletImportDialog extends Dialog { dialogPane.setPrefWidth(500); dialogPane.setPrefHeight(600); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); setResultConverter(dialogButton -> dialogButton != cancelButtonType ? wallet : null); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WalletSummaryDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/WalletSummaryDialog.java index 1d0bd575..2fb67422 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WalletSummaryDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WalletSummaryDialog.java @@ -116,6 +116,7 @@ public class WalletSummaryDialog extends Dialog { ButtonType okButtonType = new javafx.scene.control.ButtonType("Done", ButtonBar.ButtonData.OK_DONE); dialogPane.getButtonTypes().addAll(okButtonType); + setResizable(true); AppServices.moveToActiveWindowScreen(this); } diff --git a/src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportDialog.java b/src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportDialog.java index 62822d5c..76fb48d7 100644 --- a/src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportDialog.java @@ -55,6 +55,7 @@ public class KeystoreImportDialog extends Dialog { dialogPane.getButtonTypes().add(cancelButtonType); dialogPane.setPrefWidth(650); dialogPane.setPrefHeight(690); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); setResultConverter(dialogButton -> dialogButton != cancelButtonType ? getWatchOnlyKeystore() : null); diff --git a/src/main/java/com/sparrowwallet/sparrow/paynym/PayNymAddressesDialog.java b/src/main/java/com/sparrowwallet/sparrow/paynym/PayNymAddressesDialog.java index 04202c42..5c0f13c7 100644 --- a/src/main/java/com/sparrowwallet/sparrow/paynym/PayNymAddressesDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/paynym/PayNymAddressesDialog.java @@ -36,6 +36,7 @@ public class PayNymAddressesDialog extends Dialog { dialogPane.setPrefWidth(800); dialogPane.setPrefHeight(600); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); setResizable(true); } catch(IOException e) { diff --git a/src/main/java/com/sparrowwallet/sparrow/paynym/PayNymDialog.java b/src/main/java/com/sparrowwallet/sparrow/paynym/PayNymDialog.java index 96d55bf6..cb1196b2 100644 --- a/src/main/java/com/sparrowwallet/sparrow/paynym/PayNymDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/paynym/PayNymDialog.java @@ -27,6 +27,7 @@ public class PayNymDialog extends Dialog { dialogPane.setPrefWidth(730); dialogPane.setPrefHeight(600); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); dialogPane.getStylesheets().add(AppServices.class.getResource("app.css").toExternalForm()); diff --git a/src/main/java/com/sparrowwallet/sparrow/preferences/PreferencesDialog.java b/src/main/java/com/sparrowwallet/sparrow/preferences/PreferencesDialog.java index 82e79490..2ea5137e 100644 --- a/src/main/java/com/sparrowwallet/sparrow/preferences/PreferencesDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/preferences/PreferencesDialog.java @@ -48,6 +48,7 @@ public class PreferencesDialog extends Dialog { dialogPane.setPrefWidth(750); dialogPane.setPrefHeight(630); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); preferencesController.reconnectOnClosingProperty().set(AppServices.isConnecting() || AppServices.isConnected()); diff --git a/src/main/java/com/sparrowwallet/sparrow/preferences/ServerAliasDialog.java b/src/main/java/com/sparrowwallet/sparrow/preferences/ServerAliasDialog.java index c6617eae..1e02650a 100644 --- a/src/main/java/com/sparrowwallet/sparrow/preferences/ServerAliasDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/preferences/ServerAliasDialog.java @@ -90,6 +90,7 @@ public class ServerAliasDialog extends Dialog { dialogPane.setPrefWidth(680); dialogPane.setPrefHeight(500); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.setStageIcon(dialogPane.getScene().getWindow()); AppServices.moveToActiveWindowScreen(this); } diff --git a/src/main/java/com/sparrowwallet/sparrow/soroban/CounterpartyDialog.java b/src/main/java/com/sparrowwallet/sparrow/soroban/CounterpartyDialog.java index b003173b..2f63dec6 100644 --- a/src/main/java/com/sparrowwallet/sparrow/soroban/CounterpartyDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/soroban/CounterpartyDialog.java @@ -22,6 +22,7 @@ public class CounterpartyDialog extends Dialog { dialogPane.setPrefWidth(730); dialogPane.setPrefHeight(520); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); dialogPane.getStylesheets().add(AppServices.class.getResource("app.css").toExternalForm()); diff --git a/src/main/java/com/sparrowwallet/sparrow/soroban/InitiatorDialog.java b/src/main/java/com/sparrowwallet/sparrow/soroban/InitiatorDialog.java index e9b0896e..7c69bf1b 100644 --- a/src/main/java/com/sparrowwallet/sparrow/soroban/InitiatorDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/soroban/InitiatorDialog.java @@ -45,6 +45,7 @@ public class InitiatorDialog extends Dialog { dialogPane.setPrefWidth(730); dialogPane.setPrefHeight(530); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm()); diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedDialog.java b/src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedDialog.java index 40533171..3e63a179 100644 --- a/src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedDialog.java @@ -34,6 +34,7 @@ public class AdvancedDialog extends Dialog { dialogPane.setPrefWidth(400); dialogPane.setPrefHeight(300); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); setOnCloseRequest(event -> { diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/MixToDialog.java b/src/main/java/com/sparrowwallet/sparrow/wallet/MixToDialog.java index 8f32ce69..47983321 100644 --- a/src/main/java/com/sparrowwallet/sparrow/wallet/MixToDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/wallet/MixToDialog.java @@ -46,6 +46,7 @@ public class MixToDialog extends Dialog { dialogPane.setPrefWidth(400); dialogPane.setPrefHeight(300); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); setResultConverter(dialogButton -> dialogButton == applyButtonType ? mixToController.getMixConfig() : null); diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/MultisigBackupDialog.java b/src/main/java/com/sparrowwallet/sparrow/wallet/MultisigBackupDialog.java index ce32cc87..0f79c4dd 100644 --- a/src/main/java/com/sparrowwallet/sparrow/wallet/MultisigBackupDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/wallet/MultisigBackupDialog.java @@ -55,6 +55,7 @@ public class MultisigBackupDialog extends Dialog { dialogPane.setPrefWidth(700); dialogPane.setPrefHeight(500); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); } diff --git a/src/main/java/com/sparrowwallet/sparrow/whirlpool/WhirlpoolDialog.java b/src/main/java/com/sparrowwallet/sparrow/whirlpool/WhirlpoolDialog.java index 35598fcc..812cb564 100644 --- a/src/main/java/com/sparrowwallet/sparrow/whirlpool/WhirlpoolDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/whirlpool/WhirlpoolDialog.java @@ -27,6 +27,7 @@ public class WhirlpoolDialog extends Dialog { dialogPane.setPrefWidth(600); dialogPane.setPrefHeight(570); + dialogPane.setMinHeight(dialogPane.getPrefHeight()); AppServices.moveToActiveWindowScreen(this); dialogPane.getStylesheets().add(AppServices.class.getResource("app.css").toExternalForm());