mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-04-24 16:40:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove richtextfx dependency

Browse Source
This commit is contained in:
crschnick
2023-11-04 13:14:20 +00:00
parent 52303d253d
commit a2d317f98a
4 changed files with 4 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@@ -13,7 +13,6 @@ configurations {
apply from: "$rootDir/gradle/gradle_scripts/java.gradle"
apply from: "$rootDir/gradle/gradle_scripts/javafx.gradle"
apply from: "$projectDir/gradle_scripts/richtextfx.gradle"
apply from: "$rootDir/gradle/gradle_scripts/commons.gradle"
apply from: "$rootDir/gradle/gradle_scripts/prettytime.gradle"
apply from: "$projectDir/gradle_scripts/sentry.gradle"

87
app/gradle_scripts/richtextfx.gradle
View File

@@ -1,87 +0,0 @@
dependencies {
implementation files("${project.layout.buildDirectory.get()}/generated-modules/richtextfx-0.10.6.jar")
implementation files("${project.layout.buildDirectory.get()}/generated-modules/flowless-0.6.6.jar")
implementation files("${project.layout.buildDirectory.get()}/generated-modules/undofx-2.1.1.jar")
implementation files("${project.layout.buildDirectory.get()}/generated-modules/wellbehavedfx-0.3.3.jar")
implementation files("${project.layout.buildDirectory.get()}/generated-modules/reactfx-2.0-M5.jar")
}
addDependenciesModuleInfo {
overwriteExistingFiles = true
jdepsExtraArgs = ['-q']
outputDirectory = file("${project.layout.buildDirectory.get()}/generated-modules")
modules {
module {
artifact group: 'org.fxmisc.flowless', name: 'flowless', version: '0.6.6'
moduleInfoSource = '''
module org.fxmisc.flowless {
exports org.fxmisc.flowless;
requires static javafx.base;
requires static javafx.controls;
requires org.reactfx;
requires org.fxmisc.wellbehavedfx;
}
'''
}
module {
artifact group: 'org.fxmisc.undo', name: 'undofx', version: '2.1.1'
moduleInfoSource = '''
module org.fxmisc.undofx {
exports org.fxmisc.undo;
requires static javafx.base;
requires static javafx.controls;
requires org.reactfx;
requires org.fxmisc.wellbehavedfx;
}
'''
}
module {
artifact group: 'org.fxmisc.wellbehaved', name: 'wellbehavedfx', version: '0.3.3'
moduleInfoSource = '''
module org.fxmisc.wellbehavedfx {
exports org.fxmisc.wellbehaved.event;
exports org.fxmisc.wellbehaved.event.template;
requires static javafx.base;
requires static javafx.controls;
requires org.reactfx;
}
'''
}
module {
artifact group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.10.6'
moduleInfoSource = '''
module org.fxmisc.richtext {
exports org.fxmisc.richtext;
exports org.fxmisc.richtext.model;
exports org.fxmisc.richtext.event;
requires org.fxmisc.flowless;
requires org.fxmisc.undofx;
requires org.fxmisc.wellbehavedfx;
requires static javafx.base;
requires static javafx.controls;
requires org.reactfx;
}
'''
}
module {
artifact group: 'org.reactfx', name: 'reactfx', version: '2.0-M5'
moduleInfoSource = '''
module org.reactfx {
exports org.reactfx;
exports org.reactfx.collection;
exports org.reactfx.value;
exports org.reactfx.util;
requires static javafx.base;
requires static javafx.controls;
}
'''
}
}
}

9
app/src/main/java/io/xpipe/app/fxcomps/impl/CodeSnippetComp.java
View File

@@ -8,10 +8,10 @@ import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.value.ObservableValue;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TextArea;
import javafx.scene.input.ScrollEvent;
import javafx.scene.layout.*;
import javafx.scene.paint.Color;
import org.fxmisc.richtext.InlineCssTextArea;
import org.kordamp.ikonli.javafx.FontIcon;
import java.awt.*;
@@ -37,7 +37,7 @@ public class CodeSnippetComp extends Comp<CompStructure<?>> {
return String.format("#%02X%02X%02X", (int) (color.getRed() * 255), (int) (color.getGreen() * 255), (int) (color.getBlue() * 255));
}
private void fillArea(VBox lineNumbers, InlineCssTextArea s) {
private void fillArea(VBox lineNumbers, TextArea s) {
lineNumbers.getChildren().clear();
s.clear();
@@ -48,8 +48,7 @@ public class CodeSnippetComp extends Comp<CompStructure<?>> {
lineNumbers.getChildren().add(numberLabel);
for (var el : line.elements()) {
String hex = toRGBCode(el.color());
s.append(el.text(), "-fx-fill: " + hex + ";");
s.appendText(el.text());
}
boolean last = number == value.getValue().lines().size();
@@ -77,7 +76,7 @@ public class CodeSnippetComp extends Comp<CompStructure<?>> {
@Override
public CompStructure<?> createBase() {
var s = new InlineCssTextArea();
var s = new javafx.scene.control.TextArea();
s.setEditable(false);
s.setBackground(null);
s.getStyleClass().add("code-snippet");

5
app/src/main/java/module-info.java
View File

@@ -53,13 +53,8 @@ open module io.xpipe.app {
requires com.vladsch.flexmark_util_sequence;
requires com.fasterxml.jackson.core;
requires com.fasterxml.jackson.databind;
requires org.fxmisc.richtext;
requires org.fxmisc.flowless;
requires net.synedra.validatorfx;
requires org.fxmisc.undofx;
requires org.fxmisc.wellbehavedfx;
requires org.kordamp.ikonli.feather;
requires org.reactfx;
requires io.xpipe.modulefs;
requires io.xpipe.core;
requires static lombok;