Skip to content

Commit 4156567

Browse files
committed
updated UI.
1 parent 829d9dc commit 4156567

25 files changed

+21
-37
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
* -Fixed some problems with saving files.
2424
* -Fixed copying files from the Editor to Nautilus(file explorer in Ubuntu).
2525
* -Integrated global/local water filters to scene editor.
26+
* -Added an action to menu "Clear Asset Cache" to clear native memory.
27+
* -Downgraded the library spaceshift-extension to java 7, now we can use j3s in android projects.
28+
* -Added some water filters to scene editor.
2629
* -Fixed some bugs.
2730

2831
## ver. 0.9.10 ##

src/main/java/com/ss/editor/Editor.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,9 @@ static Editor prepareToStart() {
116116

117117
private static void configureLogger() {
118118

119-
//final PlatformLogger cssLogger = Logging.getCSSLogger();
120-
121119
// disable the standard logger
122120
if (!Config.DEV_DEBUG) {
123121
java.util.logging.Logger.getLogger("").setLevel(Level.WARNING);
124-
//cssLogger.setLevel(PlatformLogger.Level.OFF);
125-
} else {
126-
//cssLogger.setLevel(PlatformLogger.Level.ALL);
127122
}
128123

129124
// configure our logger

src/main/resources/app-config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<list>
33
<set name="Graphics.enablePBR" value="true"/>
44

5-
<set name="Dev.debug" value="true"/>
5+
<set name="Dev.debug" value="false"/>
66
<set name="Dev.cameraDebug" value="false"/>
77
<set name="Dev.transformsDebug" value="false"/>
88
<set name="Dev.jfxKeyInput" value="false"/>

src/main/resources/ui/css/base.css

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
1-
@font-face {
2-
src: url("/ui/fonts/ubuntu/Ubuntu-R.ttf");
3-
}
4-
5-
@font-face {
6-
src: url("/ui/fonts/ubuntu/Ubuntu-C.ttf");
7-
}
8-
9-
@font-face {
10-
src: url("/ui/fonts/ubuntu/Ubuntu-M.ttf");
11-
}
12-
131
@font-face {
142
src: url("/ui/fonts/ubuntu/UbuntuMono-B.ttf");
153
}
164

175
@font-face {
18-
src: url("/ui/fonts/Open_Sans/OpenSans-Regular.ttf");
6+
src: url("/ui/fonts/opensans/OpenSans-Regular.ttf");
197
}
208

219
@font-face {
22-
src: url("/ui/fonts/Open_Sans/OpenSans-SemiBold.ttf");
10+
src: url("/ui/fonts/opensans/OpenSans-SemiBold.ttf");
2311
}
2412

2513
.root {
@@ -54,7 +42,7 @@
5442
******************************************************************************/
5543

5644
.label {
57-
-fx-font-family: "Open Sans Regular";
45+
-fx-font-family: "Open Sans SemiBold";
5846
-fx-font-size: 13px;
5947
-fx-text-fill: -var-font-color;
6048
-fx-max-height: -var-default-label-height;
@@ -164,7 +152,7 @@
164152
}
165153

166154
.tab-pane > .tab-header-area > .headers-region > .tab > .tab-container > .tab-label {
167-
-fx-font-family: "Open Sans Regular";
155+
-fx-font-family: "Open Sans SemiBold";
168156
-fx-font-size: 13px;
169157
}
170158

@@ -296,7 +284,7 @@
296284
-fx-padding: 0px 0px 0px 0px;
297285
-fx-alignment: CENTER;
298286
-fx-content-display: LEFT;
299-
-fx-font-family: "Open Sans Regular";
287+
-fx-font-family: "Open Sans SemiBold";
300288
-fx-font-size: 13px;
301289
-fx-text-fill: -var-font-color;
302290
}
@@ -458,7 +446,7 @@
458446
-fx-text-fill: -var-font-color;
459447
-fx-padding: 0 0 0 4px;
460448
-fx-cell-size: -1;
461-
-fx-font-family: "Open Sans Regular";
449+
-fx-font-family: "Open Sans SemiBold";
462450
-fx-font-size: 13px;
463451
}
464452

@@ -486,7 +474,7 @@
486474
-fx-padding: 0px 0px 0px 4px;
487475
-fx-background-color: -fx-background;
488476
-fx-cell-size: 26;
489-
-fx-font-family: "Open Sans Regular";
477+
-fx-font-family: "Open Sans SemiBold";
490478
-fx-font-size: 13px;
491479
}
492480

@@ -842,7 +830,7 @@
842830
.hyperlink {
843831
-fx-padding: 1px;
844832
-fx-text-fill: -fx-focus-color;
845-
-fx-font-family: "Open Sans Regular";
833+
-fx-font-family: "Open Sans SemiBold";
846834
-fx-font-size: 13px;
847835
}
848836

@@ -853,7 +841,7 @@
853841
******************************************************************************/
854842

855843
.tooltip {
856-
-fx-font-family: "Open Sans Regular";
844+
-fx-font-family: "Open Sans SemiBold";
857845
-fx-font-size: 13px;
858846
-fx-padding: 6px;
859847
-fx-background-color: -var-menu-background-color;
@@ -1118,7 +1106,7 @@
11181106
-fx-text-fill: -var-font-color;
11191107
-fx-cursor: text;
11201108
-fx-min-height: -var-default-field-height;
1121-
-fx-font-family: "Open Sans Regular";
1109+
-fx-font-family: "Open Sans SemiBold";
11221110
-fx-font-size: 13px;
11231111
}
11241112

@@ -1185,7 +1173,7 @@
11851173
-fx-text-fill: -var-font-color;
11861174
-fx-padding: 0px;
11871175
-fx-indent: 1em;
1188-
-fx-font-family: "Open Sans Regular";
1176+
-fx-font-family: "Open Sans SemiBold";
11891177
-fx-font-size: 13px;
11901178
}
11911179

src/main/resources/ui/css/custom_classes.css

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
******************************************************************************/
66

77
.special-font-13 {
8-
-fx-font-family: "Open Sans Regular";
8+
-fx-font-family: "Open Sans SemiBold";
99
-fx-font-size: 12px;
1010
}
1111

1212
.special-font-14 {
13-
-fx-font-family: "Open Sans Regular";
13+
-fx-font-family: "Open Sans SemiBold";
1414
-fx-font-size: 13px;
1515
}
1616

1717
.special-font-16 {
18-
-fx-font-family: "Open Sans Regular";
18+
-fx-font-family: "Open Sans SemiBold";
1919
-fx-font-size: 15;
2020
}
2121

@@ -228,14 +228,14 @@
228228
-fx-border-color: transparent;
229229
-fx-border-width: 0px;
230230
-fx-border-radius: 0px;
231-
-fx-padding: 0px 0px 0px 4px;
231+
-fx-padding: 0px 0px 0px 0px;
232232
}
233233

234234
.transparent-text-field:focused {
235235
-fx-border-color: transparent;
236236
-fx-border-width: 0px;
237237
-fx-border-insets: 0;
238-
-fx-padding: 0px 0px 0px 4px;
238+
-fx-padding: 0px 0px 0px 0px;
239239
-fx-prompt-text-fill: transparent;
240240
}
241241

@@ -762,11 +762,9 @@
762762
.abstract-param-control-short-input-container {
763763
-fx-alignment: center;
764764
-fx-max-height: -var-default-field-height;
765-
-fx-padding: 0px 0px 0px 0px;
766765
}
767766

768767
.abstract-param-control-short-input-container:focused {
769-
-fx-padding: -1px -1px -1px -1px;
770768
}
771769

772770
.abstract-param-control-short-input-container > .text-field {
@@ -1231,7 +1229,7 @@
12311229
******************************************************************************/
12321230

12331231
.custom-tooltip {
1234-
-fx-font-family: "Open Sans Regular";
1232+
-fx-font-family: "Open Sans SemiBold";
12351233
-fx-font-size: 13;
12361234
-fx-padding: 6px;
12371235
-fx-background-insets: 0;
-219 KB
Binary file not shown.
-208 KB
Binary file not shown.
-217 KB
Binary file not shown.
Binary file not shown.
-208 KB
Binary file not shown.

0 commit comments

Comments
 (0)