Skip to content

Commit 4da5648

Browse files
JavaSaBrJavaSaBr
committed
updated editing UI
1 parent ea2672e commit 4da5648

24 files changed

Lines changed: 461 additions & 314 deletions

‎resources/ui/css/base.bss‎

3.53 KB
Binary file not shown.

‎resources/ui/css/base.css‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,6 +1090,123 @@
10901090
-fx-opacity: -var-disabled-opacity;
10911091
}
10921092

1093+
1094+
/*******************************************************************************
1095+
* *
1096+
* ListView and ListCell *
1097+
* *
1098+
******************************************************************************/
1099+
1100+
.list-view {
1101+
-fx-border-color: -var-border-color;
1102+
-fx-border-width: 1px;
1103+
-fx-background-color: transparent;
1104+
-fx-background-insets: 0;
1105+
-fx-padding: 1px;
1106+
}
1107+
1108+
.list-view:focused {
1109+
-fx-border-color: -var-border-color, -fx-focus-color;
1110+
-fx-border-width: 1px, 1px;
1111+
-fx-border-insets: 0 0 0 0, 1 1 1 1;
1112+
-fx-background-color: transparent;
1113+
-fx-background-insets: 0;
1114+
-fx-background-radius: 0;
1115+
-fx-padding: 0px;
1116+
}
1117+
1118+
.list-view > .virtual-flow > .scroll-bar:vertical {
1119+
-fx-background-insets: 0;
1120+
-fx-padding: 0px 1px 0px 1px;
1121+
}
1122+
1123+
.list-view > .virtual-flow > .scroll-bar:horizontal {
1124+
-fx-background-insets: 0;
1125+
-fx-padding: 1px 0px 1px 0px;
1126+
}
1127+
1128+
.list-view:disabled {
1129+
-fx-opacity: -var-disabled-opacity;
1130+
}
1131+
1132+
.list-view > .virtual-flow > .corner {
1133+
-fx-background-color: transparent;
1134+
-fx-background-insets: 0;
1135+
}
1136+
1137+
.list-cell {
1138+
-fx-min-height: -var-default-cell-height;
1139+
-fx-background-color: transparent;
1140+
-fx-text-fill: -var-font-color;
1141+
-fx-padding: 0px;
1142+
-fx-indent: 1em;
1143+
}
1144+
1145+
.list-cell .label {
1146+
-fx-padding: 0px 0px 0px 3px;
1147+
}
1148+
1149+
.list-cell:odd {
1150+
-fx-background-color: transparent;
1151+
}
1152+
1153+
.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:hover {
1154+
-fx-background-color: transparent;
1155+
-fx-background-insets: 0;
1156+
-fx-text-fill: -var-font-hover-color;
1157+
}
1158+
1159+
.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:hover {
1160+
-fx-background-color: -var-tree-cell-hover-color;
1161+
-fx-background-insets: 0;
1162+
-fx-text-fill: -var-font-hover-color;
1163+
}
1164+
1165+
.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:focused {
1166+
-fx-background-color: transparent;
1167+
-fx-background-insets: 0;
1168+
}
1169+
1170+
.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:focused:selected {
1171+
-fx-background-color: transparent;
1172+
-fx-background-insets: 0;
1173+
-fx-text-fill: -var-font-focused-color;
1174+
}
1175+
1176+
.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected,
1177+
.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected:hover {
1178+
-fx-background-color: -var-tree-cell-selected-color;
1179+
-fx-text-fill: -var-font-focused-color;
1180+
}
1181+
1182+
.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:focused:selected:hover {
1183+
-fx-background-color: -var-tree-cell-selected-color;
1184+
-fx-background-insets: 0;
1185+
-fx-text-fill: -var-font-focused-color;
1186+
}
1187+
1188+
.list-cell:filled:selected:focused,
1189+
.list-cell:filled:selected {
1190+
-fx-background-color: -var-tree-cell-selected-color;
1191+
-fx-text-fill: -var-font-focused-color;
1192+
}
1193+
1194+
.list-cell:filled:selected:focused:disabled,
1195+
.list-cell:filled:selected:disabled {
1196+
-fx-opacity: -var-disabled-opacity;
1197+
}
1198+
1199+
.list-cell:filled:hover {
1200+
-fx-background-color: -var-tree-cell-hover-color;
1201+
-fx-text-fill: -var-font-hover-color;
1202+
}
1203+
1204+
.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:focused:hover {
1205+
-fx-background-color: transparent;
1206+
-fx-background-insets: 0;
1207+
-fx-text-fill: -var-font-hover-color;
1208+
}
1209+
10931210
/*******************************************************************************
10941211
* *
10951212
* Tree View and Tree Cell *

‎resources/ui/css/custom_classes.bss‎

1.01 KB
Binary file not shown.

‎resources/ui/css/custom_classes.css‎

Lines changed: 113 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,78 @@
538538
-fx-border-insets: 0;
539539
}
540540

541+
/*******************************************************************************
542+
* *
543+
* Choose Texture control *
544+
* *
545+
******************************************************************************/
546+
547+
.choose-texture-control {
548+
-fx-alignment: center-right;
549+
-fx-spacing: 1px;
550+
}
551+
552+
.choose-texture-control > .hbox {
553+
-fx-alignment: center-right;
554+
-fx-padding: 0px 0px 0px 4px;
555+
}
556+
557+
.choose-texture-control > .label {
558+
-fx-alignment: center-right;
559+
-fx-padding: 0px 0px 0px 0px;
560+
}
561+
562+
.choose-texture-control-texture-label {
563+
-fx-alignment: center-left;
564+
}
565+
566+
.choose-texture-control-preview {
567+
-fx-min-height: -var-default-field-height;
568+
-fx-pref-height: -fx-min-height;
569+
-fx-max-height: -fx-min-height;
570+
-fx-min-width: -var-default-field-height;
571+
-fx-pref-width: -fx-min-width;
572+
-fx-max-width: -fx-min-width;
573+
}
574+
575+
/*******************************************************************************
576+
* *
577+
* Transparent List View *
578+
* *
579+
******************************************************************************/
580+
581+
.transparent-list-view {
582+
-fx-padding: 0px;
583+
-fx-border-color: transparent;
584+
-fx-border-width: 0px;
585+
-fx-border-radius: 0px;
586+
}
587+
588+
.transparent-list-view:focused {
589+
-fx-border-color: transparent;
590+
-fx-border-width: 0px;
591+
-fx-border-insets: 0;
592+
}
593+
594+
/*******************************************************************************
595+
* *
596+
* List View Without Scroll *
597+
* *
598+
******************************************************************************/
599+
600+
.list-view-without-scroll .scroll-bar:vertical,
601+
.list-view-without-scroll .scroll-bar:horizontal,
602+
.list-view-without-scroll .scroll-bar:vertical .increment-arrow,
603+
.list-view-without-scroll .scroll-bar:vertical .decrement-arrow,
604+
.list-view-without-scroll .scroll-bar:vertical .increment-button,
605+
.list-view-without-scroll .scroll-bar:vertical .decrement-button,
606+
.list-view-without-scroll .scroll-bar:horizontal .increment-arrow,
607+
.list-view-without-scroll .scroll-bar:horizontal .decrement-arrow,
608+
.list-view-without-scroll .scroll-bar:horizontal .increment-button,
609+
.list-view-without-scroll .scroll-bar:horizontal .decrement-button {
610+
-fx-padding: 0;
611+
}
612+
541613
/*******************************************************************************
542614
* *
543615
* Settings Dialog *
@@ -579,7 +651,6 @@
579651
* *
580652
******************************************************************************/
581653

582-
583654
.abstract-param-control-container {
584655
-fx-alignment: top-center;
585656
-fx-padding: 2px 6px 4px 4px;
@@ -703,81 +774,71 @@
703774
-fx-max-width: -fx-min-width;
704775
}
705776

777+
/*******************************************************************************
778+
* *
779+
* Paint Processing *
780+
* *
781+
******************************************************************************/
706782

707-
/* transparent list view */
708-
709-
.transparent-list-view {
710-
-fx-background-color: transparent;
711-
-fx-background-insets: 0px;
712-
-fx-padding: 0px;
713-
-fx-effect: null;
783+
.processing-component-container {
714784
}
715785

716-
.transparent-list-view:focused {
717-
-fx-background-color: transparent;
786+
.processing-component-terrain-editor {
787+
-fx-spacing: 2px;
788+
-fx-padding: 0px 0px 0px 4px;
718789
}
719790

720-
.transparent-list-view > .virtual-flow > .corner {
721-
-fx-background-color: derive(-fx-base, -1%);
791+
.processing-component-terrain-editor > .grid-pane {
792+
-fx-vgap: 2px;
793+
-fx-hgap: 2px;
722794
}
723795

724-
.transparent-list-view:focused > .virtual-flow > .clipped-container > .sheet > .transparent-list-cell:filled:selected {
725-
-fx-background: -fx-color-500;
726-
-fx-table-cell-border-color: transparent;
727-
-fx-text-fill: -fx-font-color;
796+
.processing-component-terrain-editor > .vbox > .grid-pane {
797+
-fx-vgap: 2px;
798+
-fx-hgap: 2px;
728799
}
729800

730-
.transparent-list-view:focused > .virtual-flow > .clipped-container > .sheet > .transparent-list-cell:focused {
731-
-fx-background-color: -fx-background;
732-
-fx-background-insets: 0;
733-
-fx-text-fill: -fx-font-color;
801+
.processing-component-terrain-editor > .vbox > .grid-pane > .vbox {
802+
-fx-padding: 0px -2px 0px 0px;
734803
}
735804

736-
/* list view without scrolls */
737-
738-
.list-view-without-scroll .scroll-bar:vertical,
739-
.list-view-without-scroll .scroll-bar:horizontal,
740-
.list-view-without-scroll .scroll-bar:vertical .increment-arrow,
741-
.list-view-without-scroll .scroll-bar:vertical .decrement-arrow,
742-
.list-view-without-scroll .scroll-bar:vertical .increment-button,
743-
.list-view-without-scroll .scroll-bar:vertical .decrement-button,
744-
.list-view-without-scroll .scroll-bar:horizontal .increment-arrow,
745-
.list-view-without-scroll .scroll-bar:horizontal .decrement-arrow,
746-
.list-view-without-scroll .scroll-bar:horizontal .increment-button,
747-
.list-view-without-scroll .scroll-bar:horizontal .decrement-button {
748-
-fx-padding: 0;
805+
.processing-component-terrain-layer {
806+
-fx-padding: 4px 0px 4px 2px;
807+
-fx-min-height: 108px;
808+
-fx-max-height: -fx-min-height;
749809
}
750810

751-
/* transparent list cell */
752-
753-
.transparent-list-cell {
754-
-fx-background: transparent;
755-
-fx-background-color: -fx-background;
756-
-fx-text-fill: -fx-font-color;
811+
.processing-component-terrain-layer > .grid-pane {
812+
-fx-vgap: 1px;
813+
-fx-padding: 0px 0px 0px 0px;
757814
}
758815

759-
.transparent-list-cell:filled:selected {
760-
-fx-background: -fx-selection-bar-non-focused;
761-
-fx-table-cell-border-color: transparent;
762-
-fx-text-fill: -fx-font-color;
816+
.processing-component-terrain-texture-layers-settings-buttons {
817+
-fx-alignment: center;
818+
-fx-padding: 4px;
763819
}
764820

765-
/* list cell without any padding */
766-
767-
.list-cell-without-padding {
768-
-fx-padding: 0;
821+
.processing-component-terrain-texture-layers-settings-buttons > .button {
822+
-fx-min-height: -var-default-toolbar-button-size;
823+
-fx-pref-height: -fx-min-height;
824+
-fx-max-height: -fx-min-height;
825+
-fx-min-width: -var-default-toolbar-button-size;
826+
-fx-pref-width: -fx-min-width;
827+
-fx-max-width: -fx-min-width;
769828
}
770829

771-
.list-cell-without-padding:filled:selected {
772-
-fx-padding: 0;
773-
}
774830

831+
/*******************************************************************************
832+
* *
833+
* Medium Toggle Button *
834+
* *
835+
******************************************************************************/
775836

776-
.editing-toggle-button-big {
837+
.medium-toggle-button {
777838
-fx-min-height: 32;
778839
-fx-pref-height: -fx-min-height;
779840
-fx-max-height: -fx-min-height;
780841
-fx-min-width: 32;
781842
-fx-pref-width: -fx-min-width;
782843
-fx-max-width: -fx-min-width;
783-
}
844+
}

‎resources/ui/css/custom_ids.bss‎

-906 Bytes
Binary file not shown.

‎resources/ui/css/custom_ids.css‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -208,27 +208,6 @@
208208
-fx-max-width: -fx-min-width;
209209
}
210210

211-
#ChooseTextureControlTextureLabel {
212-
-fx-min-height: 25;
213-
-fx-pref-height: -fx-min-height;
214-
-fx-max-height: -fx-min-height;
215-
-fx-min-width: 250;
216-
-fx-pref-width: -fx-min-width;
217-
-fx-max-width: -fx-min-width;
218-
-fx-alignment: center-left;
219-
}
220-
221-
#ChooseTextureControlPreview {
222-
-fx-min-height: 24;
223-
-fx-pref-height: -fx-min-height;
224-
-fx-max-height: -fx-min-height;
225-
-fx-min-width: 24;
226-
-fx-pref-width: -fx-min-width;
227-
-fx-max-width: -fx-min-width;
228-
-fx-border-color: -fx-color-panel-50;
229-
-fx-border-width: 1;
230-
}
231-
232211
#ChooseFolderControlFolderLabel {
233212
-fx-min-height: 25;
234213
-fx-pref-height: -fx-min-height;
@@ -323,27 +302,6 @@
323302
-fx-background-color: -var-background-color;
324303
}
325304

326-
#ProcessingComponentContainer {
327-
-fx-background-color: -var-background-color;
328-
}
329-
330-
#TerrainEditingTextureLayerSettings {
331-
-fx-vgap: 2px;
332-
-fx-padding: 2 0 2 0;
333-
}
334-
335-
#TerrainEditingTextureControlSettings {
336-
-fx-padding: 0 10 0 0;
337-
}
338-
339-
#TerrainEditingTextureLayersSettings {
340-
-fx-padding: 10 0 0 0;
341-
}
342-
343-
#TerrainEditingTextureLayersSettingsButtons {
344-
-fx-alignment: center;
345-
}
346-
347305
#AbstractDialogGridSettingsContainer {
348306
-fx-alignment: center-left;
349307
-fx-vgap: 2;

0 commit comments

Comments
 (0)