Skip to content

Commit f222790

Browse files
JavaSaBrJavaSaBr
committed
updated styles.
1 parent b6d0462 commit f222790

14 files changed

Lines changed: 188 additions & 204 deletions

File tree

‎resources/log4j.properties‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Root logger option
2+
log4j.rootLogger=INFO, stdout
3+
4+
# Direct log messages to stdout
5+
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
6+
log4j.appender.stdout.Target=System.out
7+
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
8+
log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n

‎resources/ui/css/base.bss‎

602 Bytes
Binary file not shown.

‎resources/ui/css/base.css‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,3 +1828,28 @@
18281828
-fx-max-height: -fx-min-height;
18291829
-fx-font-size: 16px;
18301830
}
1831+
1832+
1833+
/*******************************************************************************
1834+
* *
1835+
* ProgressIndicator *
1836+
* *
1837+
******************************************************************************/
1838+
1839+
.progress-indicator {
1840+
}
1841+
.progress-indicator > .determinate-indicator > .indicator {
1842+
}
1843+
.progress-indicator > .determinate-indicator > .progress {
1844+
}
1845+
.progress-indicator > .determinate-indicator > .tick {
1846+
}
1847+
.progress-indicator > .percentage {
1848+
}
1849+
.progress-indicator:indeterminate > .spinner {
1850+
-fx-background-color: transparent;
1851+
-fx-border-color: transparent;
1852+
}
1853+
.progress-indicator:indeterminate .segment {
1854+
-fx-background-color: -fx-focus-color;
1855+
}

‎resources/ui/css/custom_classes.bss‎

-1.01 KB
Binary file not shown.

‎resources/ui/css/custom_classes.css‎

Lines changed: 8 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,64 +4,6 @@
44
* *
55
******************************************************************************/
66

7-
.main-font-11 {
8-
-fx-font-family: "Ubuntu Regular";
9-
-fx-font-size: 11px;
10-
}
11-
12-
.main-font-12 {
13-
-fx-font-family: "Ubuntu Regular";
14-
-fx-font-size: 12px;
15-
}
16-
17-
.main-font-13 {
18-
-fx-font-family: "Ubuntu Regular";
19-
-fx-font-size: 13px;
20-
}
21-
22-
.main-font-14 {
23-
-fx-font-family: "Ubuntu Regular";
24-
-fx-font-size: 14px;
25-
}
26-
27-
.main-font-14-bold {
28-
-fx-font-family: "Ubuntu Regular";
29-
-fx-font-size: 14px;
30-
-fx-font-weight: bolder;
31-
}
32-
33-
.main-font-15 {
34-
-fx-font-family: "Ubuntu Regular";
35-
-fx-font-size: 15px;
36-
}
37-
38-
.main-font-15-bold {
39-
-fx-font-family: "Ubuntu Regular";
40-
-fx-font-size: 15px;
41-
-fx-font-weight: bolder;
42-
}
43-
44-
.main-font-15-bold-with-shadow {
45-
-fx-font-family: "Ubuntu Regular";
46-
-fx-font-size: 15px;
47-
-fx-effect: dropshadow(one-pass-box, black, 2, 1, 1, 1);
48-
}
49-
50-
.main-font-17 {
51-
-fx-font-family: "Ubuntu Regular";
52-
-fx-font-size: 17px;
53-
}
54-
55-
.main-font-20 {
56-
-fx-font-family: "Ubuntu Regular";
57-
-fx-font-size: 20px;
58-
}
59-
60-
.special-font-12 {
61-
-fx-font-family: "Ubuntu Condensed";
62-
-fx-font-size: 12px;
63-
}
64-
657
.special-font-13 {
668
-fx-font-family: "Ubuntu Condensed";
679
-fx-font-size: 13px;
@@ -87,9 +29,14 @@
8729
-fx-font-size: 22;
8830
}
8931

90-
.mono-font-13 {
91-
-fx-font-family: "Ubuntu Mono";
92-
-fx-font-size: 13px;
32+
/*******************************************************************************
33+
* *
34+
* Main Split Pane *
35+
* *
36+
******************************************************************************/
37+
38+
.main-split-pane {
39+
-fx-background-color: transparent;
9340
}
9441

9542
/*******************************************************************************

‎resources/ui/css/custom_ids.bss‎

-74 Bytes
Binary file not shown.

‎resources/ui/css/custom_ids.css‎

Lines changed: 69 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
1+
/*******************************************************************************
2+
* *
3+
* Root *
4+
* *
5+
******************************************************************************/
6+
7+
#Root {
8+
-fx-background-color: -var-background-color;
9+
}
110

211
#RootContainer {
312
-fx-alignment: top-center;
413
}
514

15+
/*******************************************************************************
16+
* *
17+
* Editor MenuBar Component *
18+
* *
19+
******************************************************************************/
20+
621
#EditorMenuBarComponent {
722
-fx-padding: 0px;
823
-fx-min-height: 30px;
@@ -12,28 +27,15 @@
1227
-fx-border-color: -var-split-line-color;
1328
}
1429

15-
#EditorLoadingLayer {
16-
-fx-background-color: rgba(0, 0, 0, 0.3);
17-
-fx-alignment: center;
18-
}
19-
20-
#EditorLoadingProgress {
21-
-fx-min-height: 150;
22-
-fx-pref-height: -fx-min-height;
23-
-fx-max-height: -fx-min-height;
24-
-fx-min-width: 150;
25-
-fx-pref-width: -fx-min-width;
26-
-fx-max-width: -fx-min-width;
27-
}
28-
2930
/*******************************************************************************
3031
* *
31-
* Main Split Pane *
32+
* Editor Area Component *
3233
* *
3334
******************************************************************************/
3435

35-
#MainSplitPane {
36-
-fx-background-color: transparent;
36+
#EditorAreaComponent {
37+
-fx-min-width: 500;
38+
-fx-tab-max-height: 18;
3739
}
3840

3941
/*******************************************************************************
@@ -58,6 +60,56 @@
5860
-fx-tab-max-height: 18;
5961
}
6062

63+
/*******************************************************************************
64+
* *
65+
* Log View *
66+
* *
67+
******************************************************************************/
68+
69+
#LogView {
70+
-fx-background-color: -var-background-color;
71+
-fx-fill: -var-font-color;
72+
-fx-text-fill: -var-font-color;
73+
-fx-font-family: "Ubuntu Mono";
74+
-fx-font-size: 13px;
75+
}
76+
77+
#LogView .caret {
78+
-fx-stroke: transparent;
79+
}
80+
81+
#LogView .content {
82+
-fx-background-color: -var-background-color;
83+
-fx-fill: -var-font-color;
84+
-fx-text-fill: -var-font-color;
85+
}
86+
87+
/*******************************************************************************
88+
* *
89+
* Editor Loading *
90+
* *
91+
******************************************************************************/
92+
93+
#EditorLoadingLayer {
94+
-fx-background-color: rgba(0, 0, 0, 0.3);
95+
-fx-alignment: center;
96+
}
97+
98+
#EditorLoadingProgress {
99+
-fx-min-height: 150;
100+
-fx-pref-height: -fx-min-height;
101+
-fx-max-height: -fx-min-height;
102+
-fx-min-width: 150;
103+
-fx-pref-width: -fx-min-width;
104+
-fx-max-width: -fx-min-width;
105+
}
106+
107+
/*******************************************************************************
108+
* *
109+
* Asset Component *
110+
* *
111+
******************************************************************************/
112+
61113
#AssetComponent {
62114
-fx-background-color: -var-background-color;
63115
-fx-alignment: top-center;
@@ -81,11 +133,6 @@
81133
-fx-max-width: -fx-min-width;
82134
}
83135

84-
#EditorAreaComponent {
85-
-fx-min-width: 500;
86-
-fx-tab-max-height: 18;
87-
}
88-
89136
#AssetEditorDialogButtonContainer {
90137
-fx-alignment: center-right;
91138
-fx-padding: 0 0 0 0;
@@ -212,22 +259,6 @@
212259
#JmePreviewManagerImageView {
213260
}
214261

215-
#LogView {
216-
-fx-background-color: -var-background-color;
217-
-fx-fill: white;
218-
-fx-text-fill: white;
219-
}
220-
221-
#LogView .caret {
222-
-fx-stroke: white;
223-
}
224-
225-
#LogView .content {
226-
-fx-background-color: -var-background-color;
227-
-fx-fill: white;
228-
-fx-text-fill: white;
229-
}
230-
231262
#GenerateLoDDialogListView {
232263
-fx-min-height: 160px;
233264
-fx-pref-height: -fx-min-height;
@@ -252,10 +283,6 @@
252283
-fx-hgap: 2px;
253284
}
254285

255-
#Root {
256-
-fx-background-color: -var-background-color;
257-
}
258-
259286
#AbstractDialogGridSettingsContainer {
260287
-fx-alignment: center-left;
261288
-fx-vgap: 2;

‎src/com/ss/editor/ui/builder/EditorFXSceneBuilder.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import com.ss.editor.annotation.FXThread;
66
import com.ss.editor.config.EditorConfig;
77
import com.ss.editor.ui.component.asset.AssetComponent;
8-
import com.ss.editor.ui.component.bar.EditorMenuComponent;
8+
import com.ss.editor.ui.component.bar.EditorMenuBarComponent;
99
import com.ss.editor.ui.component.editor.area.EditorAreaComponent;
1010
import com.ss.editor.ui.component.log.LogView;
1111
import com.ss.editor.ui.component.split.pane.GlobalBottomToolSplitPane;
1212
import com.ss.editor.ui.component.split.pane.GlobalLeftToolSplitPane;
1313
import com.ss.editor.ui.component.tab.GlobalBottomToolComponent;
1414
import com.ss.editor.ui.component.tab.GlobalLeftToolComponent;
15-
import com.ss.editor.ui.css.CSSIds;
15+
import com.ss.editor.ui.css.CSSClasses;
1616
import com.ss.editor.ui.css.CssColorTheme;
1717
import com.ss.editor.ui.event.EventRedirector;
1818
import com.ss.editor.ui.scene.EditorFXScene;
@@ -103,18 +103,15 @@ private static void build(@NotNull final EditorFXScene scene,
103103
@NotNull final Stage stage) {
104104

105105
final Canvas canvas = scene.getCanvas();
106-
final EditorMenuComponent barComponent = new EditorMenuComponent();
106+
final EditorMenuBarComponent barComponent = new EditorMenuBarComponent();
107107
final EditorAreaComponent editorAreaComponent = new EditorAreaComponent();
108108

109109
new EventRedirector(editorAreaComponent, canvas, stage);
110110

111111
final GlobalLeftToolSplitPane leftSplitContainer = new GlobalLeftToolSplitPane(scene);
112-
leftSplitContainer.setId(CSSIds.MAIN_SPLIT_PANEL);
113112
leftSplitContainer.prefHeightProperty().bind(container.heightProperty());
114113

115114
final GlobalBottomToolSplitPane bottomSplitContainer = new GlobalBottomToolSplitPane(scene);
116-
bottomSplitContainer.setId(CSSIds.MAIN_SPLIT_PANEL);
117-
118115
final GlobalLeftToolComponent globalLeftToolComponent = new GlobalLeftToolComponent(leftSplitContainer);
119116
globalLeftToolComponent.addComponent(new AssetComponent(), Messages.EDITOR_TOOL_ASSET);
120117

@@ -128,5 +125,7 @@ private static void build(@NotNull final EditorFXScene scene,
128125

129126
FXUtils.bindFixedWidth(leftSplitContainer, container.widthProperty());
130127
FXUtils.bindFixedWidth(barComponent, container.widthProperty());
128+
129+
FXUtils.addClassTo(leftSplitContainer, bottomSplitContainer, CSSClasses.MAIN_SPLIT_PANEL);
131130
}
132131
}

src/com/ss/editor/ui/component/bar/EditorMenuComponent.java renamed to src/com/ss/editor/ui/component/bar/EditorMenuBarComponent.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@
1515
*
1616
* @author JavaSaBr
1717
*/
18-
public class EditorMenuComponent extends MenuBar implements ScreenComponent {
18+
public class EditorMenuBarComponent extends MenuBar implements ScreenComponent {
1919

2020
/**
2121
* The constant COMPONENT_ID.
2222
*/
23-
public static final String COMPONENT_ID = "EditorMenuComponent";
23+
@NotNull
24+
private static final String COMPONENT_ID = "EditorMenuBarComponent";
2425

2526
/**
2627
* Instantiates a new Editor bar component.
2728
*/
28-
public EditorMenuComponent() {
29+
public EditorMenuBarComponent() {
2930
super();
3031
setId(CSSIds.EDITOR_MENU_BAR_COMPONENT);
3132
createComponents();

0 commit comments

Comments
 (0)