dorkbox/Utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Uses new SwtJavaFx project (for swt/javaFX logic)

Browse Source
This commit is contained in:
Robinson 2021-01-31 21:03:40 +01:00
parent 675515c35b
commit 12e6f5ea75
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dorkbox/jna/linux/GtkCheck.java
View File

@ -15,9 +15,9 @@
*/
package dorkbox.jna.linux;
import dorkbox.util.javaFx.JavaFX;
import dorkbox.javaFx.JavaFx;
import dorkbox.swt.Swt;
import dorkbox.util.SwingUtil;
import dorkbox.util.swt.Swt;
/**
* Accessor methods/logic for determining if GTK is already loaded by the Swing/JavaFX/SWT, or if GTK has been manually loaded via
@ -110,8 +110,8 @@ class GtkCheck {
}
}
if (JavaFX.isLoaded) {
if (JavaFX.isGtk3) {
if (JavaFx.isLoaded) {
if (JavaFx.isGtk3) {
return 3;
} else {
return 2;

15
src/dorkbox/jna/linux/GtkEventDispatch.java
View File

@ -27,8 +27,9 @@ import org.slf4j.LoggerFactory;
import com.sun.jna.Pointer;
import dorkbox.util.javaFx.JavaFX;
import dorkbox.util.swt.Swt;
import dorkbox.javaFx.JavaFx;
import dorkbox.swt.Swt;
public
class GtkEventDispatch {
@ -136,8 +137,8 @@ class GtkEventDispatch {
}
});
if (JavaFX.isLoaded) {
if (!JavaFX.isEventThread()) {
if (JavaFx.isLoaded) {
if (!JavaFx.isEventThread()) {
try {
if (!blockUntilStarted.await(10, TimeUnit.SECONDS)) {
if (DEBUG) {
@ -271,14 +272,14 @@ class GtkEventDispatch {
public static
void dispatch(final Runnable runnable) {
if (GtkLoader.alreadyRunningGTK) {
if (JavaFX.isLoaded) {
if (JavaFx.isLoaded) {
// JavaFX only
if (JavaFX.isEventThread()) {
if (JavaFx.isEventThread()) {
// Run directly on the JavaFX event thread
runnable.run();
}
else {
JavaFX.dispatch(runnable);
JavaFx.dispatch(runnable);
}
return;
}

2
src/dorkbox/jna/linux/GtkLoader.java
View File

@ -22,7 +22,7 @@ import com.sun.jna.NativeLibrary;
import dorkbox.jna.JnaHelper;
import dorkbox.os.OS;
import dorkbox.util.swt.Swt;
import dorkbox.swt.Swt;
/**
* Bindings for GTK+ 2. Bindings that are exclusively for GTK+ 3 are in that respective class

2
src/dorkbox/jna/linux/GtkTheme.java
View File

@ -38,9 +38,9 @@ import dorkbox.jna.linux.structs.GtkStyle;
import dorkbox.jna.linux.structs.PangoRectangle;
import dorkbox.os.OS;
import dorkbox.os.OSUtil;
import dorkbox.swt.Swt;
import dorkbox.util.FileUtil;
import dorkbox.util.MathUtil;
import dorkbox.util.swt.Swt;
/**
* Class to contain all of the various methods needed to get information set by a GTK theme.