Skip to content

Commit cb585dc

Browse files
committed
finished working on UI.
1 parent 3490c8c commit cb585dc

18 files changed

Lines changed: 98 additions & 85 deletions
40.2 KB
Binary file not shown.
-28.6 KB
Binary file not shown.
14.9 KB
Binary file not shown.
1.05 KB
Binary file not shown.

resources/ui/css/custom_classes.css

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,6 +1112,15 @@
11121112
-fx-max-width: 598px;
11131113
}
11141114

1115+
.asset-editor-dialog > .hbox > .grid-pane {
1116+
-fx-hgap: 2px;
1117+
}
1118+
1119+
.asset-editor-dialog > .hbox > .grid-pane > .label {
1120+
-fx-alignment: center-right;
1121+
-fx-text-alignment: right;
1122+
}
1123+
11151124
.asset-editor-dialog-preview-container {
11161125
-fx-min-height: 500px;
11171126
-fx-min-width: 500px;
@@ -1159,4 +1168,33 @@
11591168
.abstract-param-editor-control {
11601169
-fx-padding: 1px 0px 1px 0px;
11611170
-fx-spacing: 2px;
1171+
}
1172+
1173+
/*******************************************************************************
1174+
* *
1175+
* Image Channel Preview *
1176+
* *
1177+
******************************************************************************/
1178+
1179+
.image-channel-preview {
1180+
-fx-hgap: 4px;
1181+
-fx-vgap: 4px;
1182+
}
1183+
1184+
/*******************************************************************************
1185+
* *
1186+
* Custom Tooltip *
1187+
* *
1188+
******************************************************************************/
1189+
1190+
.custom-tooltip {
1191+
-fx-font-family: "Ubuntu Condensed";
1192+
-fx-font-size: 14;
1193+
-fx-padding: 6px;
1194+
-fx-background-insets: 0;
1195+
-fx-background-radius: 3px;
1196+
-fx-border-color: -var-border-color;
1197+
-fx-border-width: 1px;
1198+
-fx-border-radius: 2px;
1199+
-fx-effect: -fx-shadow-menu;
11621200
}

resources/ui/css/dark-color.bss

0 Bytes
Binary file not shown.

resources/ui/css/dark-color.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
-var-background-color: #404552;
66
-var-border-color: #20222a;
7-
-var-menu-background-color: #383c4a;
87

98
-var-button-hover-color: red;
109
-var-button-arm-color: blue;
@@ -13,6 +12,7 @@
1312
-var-arrow-focused-color: derive(-var-background-color, 230%);
1413
-var-arrow-hover-color: derive(-var-background-color, 300%);
1514

15+
-var-menu-background-color: #383c4a;
1616
-var-menu-bar-background-color: #2f343f;
1717
-var-menu-hover-color: -fx-focus-color;
1818
-var-menu-item-hover-color: derive(-var-menu-background-color, 50%);

resources/ui/css/light-color.bss

0 Bytes
Binary file not shown.

resources/ui/css/light-color.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
-var-background-color: #ffffff;
66
-var-border-color: #dcdfe3;
7-
-var-menu-background-color: #ffffff;
87

98
-var-arrow-color: #70788d;
109
-var-arrow-focused-color: white;
1110
-var-arrow-hover-color: #70788d;
1211

12+
-var-menu-background-color: #ffffff;
1313
-var-menu-bar-background-color: #f5f6f7;
1414
-var-menu-hover-color: -fx-focus-color;
1515
-var-menu-item-hover-color: derive(-var-menu-background-color, -10%);

src/com/ss/editor/manager/JMEFilePreviewManager.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import static com.jme3x.jfx.injfx.JmeToJFXIntegrator.bind;
44
import static com.ss.editor.util.EditorUtil.getAssetFile;
55
import static com.ss.editor.util.EditorUtil.toAssetPath;
6-
import static java.util.Objects.requireNonNull;
76
import static com.ss.rlib.util.FileUtils.getExtension;
7+
import static com.ss.rlib.util.ObjectUtils.notNull;
88
import com.jme3.asset.AssetManager;
99
import com.jme3.environment.generation.JobProgressAdapter;
1010
import com.jme3.light.DirectionalLight;
@@ -25,20 +25,19 @@
2525
import com.ss.editor.Editor;
2626
import com.ss.editor.FileExtensions;
2727
import com.ss.editor.JFXApplication;
28-
import com.ss.editor.annotation.JMEThread;
2928
import com.ss.editor.annotation.FXThread;
3029
import com.ss.editor.annotation.FromAnyThread;
30+
import com.ss.editor.annotation.JMEThread;
3131
import com.ss.editor.executor.impl.EditorThreadExecutor;
3232
import com.ss.editor.model.tool.TangentGenerator;
33-
import com.ss.editor.ui.css.CSSIds;
3433
import com.ss.editor.ui.scene.EditorFXScene;
34+
import com.ss.rlib.ui.util.FXUtils;
35+
import com.ss.rlib.util.array.Array;
36+
import com.ss.rlib.util.array.ArrayFactory;
3537
import javafx.scene.image.ImageView;
3638
import javafx.scene.layout.StackPane;
3739
import org.jetbrains.annotations.NotNull;
3840
import org.jetbrains.annotations.Nullable;
39-
import com.ss.rlib.ui.util.FXUtils;
40-
import com.ss.rlib.util.array.Array;
41-
import com.ss.rlib.util.array.ArrayFactory;
4241

4342
import java.nio.file.Path;
4443

@@ -99,7 +98,7 @@ public static JMEFilePreviewManager getInstance() {
9998
}
10099
}
101100
}
102-
return requireNonNull(instance);
101+
return notNull(instance);
103102
}
104103

105104
/**
@@ -166,7 +165,6 @@ public void done(final LightProbe result) {
166165

167166
private JMEFilePreviewManager() {
168167
this.imageView = new ImageView();
169-
this.imageView.setId(CSSIds.JME_PREVIEW_MANAGER_IMAGE_VIEW);
170168
this.testBox = new Geometry("Box", new Box(2, 2, 2));
171169
this.modelNode = new Node("Model Node");
172170

@@ -212,7 +210,7 @@ public void show(@NotNull final Path file, final int fitWidth, final int fitHeig
212210
imageView.setFitHeight(fitHeight);
213211
imageView.setFitWidth(fitWidth);
214212

215-
final Path assetFile = requireNonNull(getAssetFile(file), "File can't be null.");
213+
final Path assetFile = notNull(getAssetFile(file), "File can't be null.");
216214
final String path = toAssetPath(assetFile);
217215
final String extension = getExtension(assetFile);
218216

0 commit comments

Comments
 (0)