diff --git a/build.gradle b/build.gradle index 988a96b7..8a1f6985 100644 --- a/build.gradle +++ b/build.gradle @@ -87,7 +87,7 @@ dependencies { implementation('com.fasterxml.jackson.core:jackson-databind:2.17.2') implementation('com.sparrowwallet:hummingbird:1.7.4') implementation('co.nstant.in:cbor:0.9') - implementation('org.openpnp:openpnp-capture-java:0.0.28-2') + implementation('org.openpnp:openpnp-capture-java:0.0.28-3') implementation("io.matthewnelson.kotlin-components:kmp-tor:${vTor}-${vKmpTor}") { exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common' } @@ -182,7 +182,6 @@ application { "--add-opens=javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx", "--add-opens=javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx", "--add-opens=javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx", - "--add-opens=javafx.graphics/com.sun.glass.ui.mac=centerdevice.nsmenufx", "--add-opens=javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx", "--add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx", "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow", @@ -231,7 +230,6 @@ jlink { "--add-opens=javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx", "--add-opens=javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx", "--add-opens=javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx", - "--add-opens=javafx.graphics/com.sun.glass.ui.mac=centerdevice.nsmenufx", "--add-opens=javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx", "--add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx", "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow", @@ -258,7 +256,7 @@ jlink { jvmArgs += ["-Djavax.accessibility.assistive_technologies", "-Djavax.accessibility.screen_magnifier_present=false"] } if(os.macOsX) { - jvmArgs += ["-Dprism.lcdtext=false", "--add-opens=javafx.graphics/com.sun.glass.ui.mac=com.sparrowwallet.merged.module"] + jvmArgs += ["-Dprism.lcdtext=false", "--add-opens=javafx.graphics/com.sun.glass.ui.mac=com.sparrowwallet.merged.module", "--add-opens=javafx.graphics/com.sun.glass.ui.mac=centerdevice.nsmenufx"] } if(headless) { jvmArgs += ["-Dglass.platform=Monocle", "-Dmonocle.platform=Headless", "-Dprism.order=sw"] diff --git a/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java index f9b8fa03..d6c39809 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java @@ -170,11 +170,13 @@ public class QRScanDialog extends Dialog { webcamResolutionProperty.addListener((_, oldResolution, newResolution) -> { if(newResolution != null) { if(newResolution.isStandardAspect() && oldResolution.isWidescreenAspect()) { + setWidth(getWidth()); setHeight(getHeight() + 100); dialogPane.setMaxHeight(dialogPane.getPrefHeight() + 100); dialogPane.setPrefHeight(dialogPane.getMaxHeight()); dialogPane.setMinHeight(dialogPane.getMaxHeight()); } else if(newResolution.isWidescreenAspect() && oldResolution.isStandardAspect()) { + setWidth(getWidth()); setHeight(getHeight() - 100); dialogPane.setMaxHeight(dialogPane.getPrefHeight() - 100); dialogPane.setPrefHeight(dialogPane.getMaxHeight()); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WebcamService.java b/src/main/java/com/sparrowwallet/sparrow/control/WebcamService.java index 423fa069..ad5570e2 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WebcamService.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WebcamService.java @@ -61,7 +61,12 @@ public class WebcamService extends ScheduledService { case 1: case 2: case 3: - log.error(ptr.getString(0).trim()); + String err = ptr.getString(0).trim(); + if(err.equals("tjDecompressHeader2 failed: No error")) { //Safe to ignore + log.debug(err); + } else { + log.error(err); + } break; case 4: case 5: