Uses new SwtJavaFx project (for swt/javaFX logic)
This commit is contained in:
parent
675515c35b
commit
12e6f5ea75
@ -15,9 +15,9 @@
|
|||||||
*/
|
*/
|
||||||
package dorkbox.jna.linux;
|
package dorkbox.jna.linux;
|
||||||
|
|
||||||
import dorkbox.util.javaFx.JavaFX;
|
import dorkbox.javaFx.JavaFx;
|
||||||
|
import dorkbox.swt.Swt;
|
||||||
import dorkbox.util.SwingUtil;
|
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
|
* 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.isLoaded) {
|
||||||
if (JavaFX.isGtk3) {
|
if (JavaFx.isGtk3) {
|
||||||
return 3;
|
return 3;
|
||||||
} else {
|
} else {
|
||||||
return 2;
|
return 2;
|
||||||
|
@ -27,8 +27,9 @@ import org.slf4j.LoggerFactory;
|
|||||||
|
|
||||||
import com.sun.jna.Pointer;
|
import com.sun.jna.Pointer;
|
||||||
|
|
||||||
import dorkbox.util.javaFx.JavaFX;
|
import dorkbox.javaFx.JavaFx;
|
||||||
import dorkbox.util.swt.Swt;
|
import dorkbox.swt.Swt;
|
||||||
|
|
||||||
|
|
||||||
public
|
public
|
||||||
class GtkEventDispatch {
|
class GtkEventDispatch {
|
||||||
@ -136,8 +137,8 @@ class GtkEventDispatch {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (JavaFX.isLoaded) {
|
if (JavaFx.isLoaded) {
|
||||||
if (!JavaFX.isEventThread()) {
|
if (!JavaFx.isEventThread()) {
|
||||||
try {
|
try {
|
||||||
if (!blockUntilStarted.await(10, TimeUnit.SECONDS)) {
|
if (!blockUntilStarted.await(10, TimeUnit.SECONDS)) {
|
||||||
if (DEBUG) {
|
if (DEBUG) {
|
||||||
@ -271,14 +272,14 @@ class GtkEventDispatch {
|
|||||||
public static
|
public static
|
||||||
void dispatch(final Runnable runnable) {
|
void dispatch(final Runnable runnable) {
|
||||||
if (GtkLoader.alreadyRunningGTK) {
|
if (GtkLoader.alreadyRunningGTK) {
|
||||||
if (JavaFX.isLoaded) {
|
if (JavaFx.isLoaded) {
|
||||||
// JavaFX only
|
// JavaFX only
|
||||||
if (JavaFX.isEventThread()) {
|
if (JavaFx.isEventThread()) {
|
||||||
// Run directly on the JavaFX event thread
|
// Run directly on the JavaFX event thread
|
||||||
runnable.run();
|
runnable.run();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
JavaFX.dispatch(runnable);
|
JavaFx.dispatch(runnable);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ import com.sun.jna.NativeLibrary;
|
|||||||
|
|
||||||
import dorkbox.jna.JnaHelper;
|
import dorkbox.jna.JnaHelper;
|
||||||
import dorkbox.os.OS;
|
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
|
* Bindings for GTK+ 2. Bindings that are exclusively for GTK+ 3 are in that respective class
|
||||||
|
@ -38,9 +38,9 @@ import dorkbox.jna.linux.structs.GtkStyle;
|
|||||||
import dorkbox.jna.linux.structs.PangoRectangle;
|
import dorkbox.jna.linux.structs.PangoRectangle;
|
||||||
import dorkbox.os.OS;
|
import dorkbox.os.OS;
|
||||||
import dorkbox.os.OSUtil;
|
import dorkbox.os.OSUtil;
|
||||||
|
import dorkbox.swt.Swt;
|
||||||
import dorkbox.util.FileUtil;
|
import dorkbox.util.FileUtil;
|
||||||
import dorkbox.util.MathUtil;
|
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.
|
* Class to contain all of the various methods needed to get information set by a GTK theme.
|
||||||
|
Loading…
Reference in New Issue
Block a user