Skip to content

Commit 4e3ae77

Browse files
committed
updated UI of the model editor.
1 parent 69c1410 commit 4e3ae77

62 files changed

Lines changed: 599 additions & 844 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

resources/ui/css/base.bss

346 Bytes
Binary file not shown.

resources/ui/css/base.css

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232

3333
-var-default-label-height: 26px;
3434
-var-default-field-height: 26px;
35+
-var-default-cell-height: 22px;
36+
-var-default-toolbar-button-size: 24px;
3537
}
3638

3739
/* Make popups transparent */
@@ -448,6 +450,8 @@
448450
-fx-padding: 0px 0px 0px 4px;
449451
-fx-background-color: -fx-background;
450452
-fx-cell-size: 26;
453+
-fx-font-family: "Ubuntu Condensed";
454+
-fx-font-size: 14px;
451455
}
452456

453457
.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
@@ -798,6 +802,8 @@
798802
.hyperlink {
799803
-fx-padding: 1px;
800804
-fx-text-fill: -fx-focus-color;
805+
-fx-font-family: "Ubuntu Condensed";
806+
-fx-font-size: 14px;
801807
}
802808

803809
/*******************************************************************************
@@ -1128,6 +1134,7 @@
11281134
}
11291135

11301136
.tree-cell {
1137+
-fx-min-height: -var-default-cell-height;
11311138
-fx-background-color: transparent;
11321139
-fx-text-fill: -var-font-color;
11331140
-fx-padding: 0px;
@@ -1298,12 +1305,14 @@
12981305
******************************************************************************/
12991306

13001307
.color-picker {
1308+
-fx-min-height: -var-default-field-height;
1309+
-fx-max-height: -var-default-field-height;
13011310
-fx-color-rect-width: 14px;
13021311
-fx-color-rect-height: 14px;
13031312
}
13041313

13051314
.color-picker.button {
1306-
-fx-padding: 0 5 0 0;
1315+
-fx-padding: 0px 5px 0px 0px;
13071316
}
13081317

13091318
.color-picker > .color-picker-label {
@@ -1395,7 +1404,6 @@
13951404
}
13961405

13971406
.custom-color-dialog .color-rect-pane .color-rect {
1398-
-fx-background-color: transparent;
13991407
-fx-min-width: 200px;
14001408
-fx-pref-width: -fx-min-width;
14011409
-fx-max-width: -fx-min-width;
@@ -1496,6 +1504,10 @@
14961504
-fx-padding: 4px;
14971505
}
14981506

1507+
.custom-color-dialog .controls-pane .left-pill:selected {
1508+
-fx-background-color: -fx-focus-color;
1509+
}
1510+
14991511
.custom-color-dialog .controls-pane .left-pill:selected, .controls-pane .left-pill:selected:focused {
15001512
-fx-background-radius: 2px 0px 0px 2px;
15011513
-fx-border-color: -var-border-color;
@@ -1531,6 +1543,10 @@
15311543
-fx-padding: 4px;
15321544
}
15331545

1546+
.custom-color-dialog .controls-pane .center-pill:selected {
1547+
-fx-background-color: -fx-focus-color;
1548+
}
1549+
15341550
.custom-color-dialog .controls-pane .right-pill {
15351551
-fx-background-color: -var-button-background-color;
15361552
-fx-background-radius: 0px 2px 2px 0px;
@@ -1561,6 +1577,10 @@
15611577
-fx-padding: 4px;
15621578
}
15631579

1580+
.custom-color-dialog .controls-pane .right-pill:selected {
1581+
-fx-background-color: -fx-focus-color;
1582+
}
1583+
15641584
.custom-color-dialog .controls-pane .current-new-color-grid #current-new-color-border {
15651585
-fx-border-color: -var-border-color;
15661586
-fx-border-width: 1px;
1.93 KB
Binary file not shown.

resources/ui/css/custom_classes.css

Lines changed: 131 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,10 @@
193193
-fx-border-width: 1px 1px 1px 0px;
194194
}
195195

196+
.button-without-left-right-border {
197+
-fx-border-width: 1px 0px 1px 0px;
198+
}
199+
196200
.button-without-right-border {
197201
-fx-border-width: 1px 0px 1px 1px;
198202
}
@@ -373,10 +377,10 @@
373377
******************************************************************************/
374378

375379
.file-editor-toolbar-button {
376-
-fx-min-height: 24px;
380+
-fx-min-height: -var-default-toolbar-button-size;
377381
-fx-pref-height: -fx-min-height;
378382
-fx-max-height: -fx-min-height;
379-
-fx-min-width: 24px;
383+
-fx-min-width: -var-default-toolbar-button-size;
380384
-fx-pref-width: -fx-min-width;
381385
-fx-max-width: -fx-min-width;
382386
}
@@ -401,11 +405,12 @@
401405
-fx-background-color: -var-background-color;
402406
-fx-border-color: -var-border-color;
403407
-fx-border-width: 0px 0px 1px 0px;
404-
-fx-min-height: 30px;
408+
-fx-min-height: 31px;
405409
-fx-pref-height: -fx-min-height;
406410
-fx-max-height: -fx-min-height;
407411
-fx-padding: 10px, 0px, 0px, 0px;
408412
-fx-alignment: center-left;
413+
-fx-spacing: 2px;
409414
}
410415

411416
.file-editor-editor-area {
@@ -430,7 +435,7 @@
430435
.material-file-editor-properties-component {
431436
-fx-background-color: transparent;
432437
-fx-alignment: top-left;
433-
-fx-padding: 0px 5px 0px 4px;
438+
-fx-padding: 1px 5px 0px 4px;
434439
}
435440

436441
.material-file-editor-param-control {
@@ -479,6 +484,41 @@
479484
.material-file-editor-param-control-combo-box {
480485
}
481486

487+
/*******************************************************************************
488+
* *
489+
* Scene File Editor *
490+
* *
491+
******************************************************************************/
492+
493+
.scene-editor-stats-container {
494+
-fx-alignment: bottom-left;
495+
}
496+
497+
/*******************************************************************************
498+
* *
499+
* Abstract Node Tree *
500+
* *
501+
******************************************************************************/
502+
503+
.abstract-node-tree-container {
504+
-fx-padding: 0px 0px 0px 0px;
505+
}
506+
507+
.abstract-node-tree-cell {
508+
}
509+
510+
.abstract-node-tree-cell > .hbox {
511+
-fx-alignment: center-left;
512+
-fx-spacing: 2px;
513+
}
514+
515+
.abstract-node-tree-cell:dragged {
516+
}
517+
518+
.abstract-node-tree-cell:drop-available {
519+
-fx-background-color: -var-tree-cell-selected-color;
520+
}
521+
482522
/*******************************************************************************
483523
* *
484524
* Transparent Tree View *
@@ -533,6 +573,92 @@
533573
-fx-min-width: 20px;
534574
}
535575

576+
/*******************************************************************************
577+
* *
578+
* Abstract Property Component *
579+
* *
580+
******************************************************************************/
581+
582+
.abstract-param-control-container {
583+
-fx-alignment: top-center;
584+
-fx-padding: 2px 6px 4px 4px;
585+
}
586+
587+
.abstract-param-control {
588+
-fx-padding: 1px 0px 1px 0px;
589+
-fx-spacing: 2px;
590+
}
591+
592+
.abstract-param-control > .hbox {
593+
-fx-spacing: 2px;
594+
}
595+
596+
.abstract-param-control-param-name {
597+
-fx-alignment: center;
598+
-fx-text-alignment: center;
599+
-fx-padding: 0px 0px 0px 0px;
600+
}
601+
602+
.abstract-param-control-param-name-single-row {
603+
-fx-alignment: center-right;
604+
}
605+
606+
.abstract-param-control-param-color-picker {
607+
}
608+
609+
.abstract-param-control-checkbox {
610+
}
611+
612+
.abstract-param-control-combobox {
613+
}
614+
615+
.abstract-param-control-vector2f-field {
616+
}
617+
618+
619+
.abstract-param-control-vector3f-field {
620+
}
621+
622+
.abstract-param-control-number-label {
623+
-fx-min-width: 10px;
624+
-fx-pref-width: -fx-min-width;
625+
-fx-max-width: -fx-min-width;
626+
-fx-alignment: center-right;
627+
-fx-text-alignment: right;
628+
}
629+
630+
.abstract-param-control-influencer-element {
631+
-fx-spacing: 2px;
632+
-fx-padding: 0px;
633+
}
634+
635+
.abstract-param-control-influencer-element > .hbox {
636+
-fx-spacing: 2px;
637+
}
638+
639+
.abstract-param-control-influencer {
640+
-fx-alignment: top-center;
641+
-fx-spacing: 2px;
642+
}
643+
644+
.abstract-param-control-influencer > .vbox {
645+
-fx-spacing: 2px;
646+
}
647+
648+
.abstract-param-control-influencer > .hbox {
649+
-fx-alignment: center;
650+
-fx-padding: 4px 0px 0px 0px;
651+
}
652+
653+
.abstract-param-control-influencer > .hbox > .button {
654+
-fx-min-height: -var-default-toolbar-button-size;
655+
-fx-pref-height: -fx-min-height;
656+
-fx-max-height: -fx-min-height;
657+
-fx-min-width: -var-default-toolbar-button-size;
658+
-fx-pref-width: -fx-min-width;
659+
-fx-max-width: -fx-min-width;
660+
}
661+
536662

537663
/* transparent list view */
538664

@@ -610,8 +736,4 @@
610736
-fx-min-width: 32;
611737
-fx-pref-width: -fx-min-width;
612738
-fx-max-width: -fx-min-width;
613-
}
614-
615-
.abstract-param-control {
616-
-fx-padding: 0 0 0 0;
617-
}
739+
}

resources/ui/css/custom_ids.bss

-2.65 KB
Binary file not shown.

0 commit comments

Comments
 (0)