Skip to content

Commit 9036cbb

Browse files
pandinocoderpandinocoder
committed
additional menu layout fixes
1 parent 1a372c4 commit 9036cbb

File tree

2 files changed

+48
-30
lines changed

2 files changed

+48
-30
lines changed

‎resources/gui/layouts/menu/CharacterCreationWindow.json‎

Lines changed: 47 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@
9393
"DisabledTextColor": null,
9494
"TextAlign": "Center",
9595
"AutoSizeToContents": false,
96-
"Font": "sourcesansproblack,12",
96+
"FontName": "sourcesansproblack",
97+
"FontSize": 12,
9798
"TextScale": 1.0,
9899
"NormalImage": null,
99100
"HoveredImage": null,
@@ -132,7 +133,8 @@
132133
"DisabledTextColor": null,
133134
"TextAlign": "Center",
134135
"AutoSizeToContents": false,
135-
"Font": "sourcesansproblack,12",
136+
"FontName": "sourcesansproblack",
137+
"FontSize": 12,
136138
"TextScale": 1.0,
137139
"NormalImage": null,
138140
"HoveredImage": null,
@@ -194,7 +196,8 @@
194196
"DisabledTextColor": null,
195197
"TextAlign": "Left, CenterV",
196198
"AutoSizeToContents": false,
197-
"Font": "sourcesansproblack,12",
199+
"FontName": "sourcesansproblack",
200+
"FontSize": 12,
198201
"TextScale": 1.0,
199202
"AddTextSound": null,
200203
"RemoveTextSound": null,
@@ -248,7 +251,8 @@
248251
"DisabledTextColor": null,
249252
"TextAlign": "Left, Top",
250253
"AutoSizeToContents": true,
251-
"Font": "sourcesansproblack,12",
254+
"FontName": "sourcesansproblack",
255+
"FontSize": 12,
252256
"TextScale": 1.0
253257
},
254258
"_comboBox": {
@@ -277,7 +281,8 @@
277281
"DisabledTextColor": null,
278282
"TextAlign": "Left, CenterV",
279283
"AutoSizeToContents": false,
280-
"Font": "sourcesansproblack,12",
284+
"FontName": "sourcesansproblack",
285+
"FontSize": 12,
281286
"TextScale": 1.0,
282287
"NormalImage": null,
283288
"HoveredImage": null,
@@ -386,7 +391,8 @@
386391
"DisabledTextColor": null,
387392
"TextAlign": "Center",
388393
"AutoSizeToContents": false,
389-
"Font": null,
394+
"FontName": null,
395+
"FontSize": null,
390396
"TextScale": 1.0,
391397
"NormalImage": null,
392398
"HoveredImage": null,
@@ -423,9 +429,11 @@
423429
"HoveredImage": null,
424430
"ClickedImage": null,
425431
"DisabledImage": null,
426-
"HoverSound": null,
427-
"MouseUpSound": null,
428-
"MouseDownSound": null
432+
"_stateSoundNames": {
433+
"Hover": "octave-tap-resonant.wav",
434+
"MouseDown": "octave-tap-warm.wav",
435+
"MouseUp": "octave-tap-warm.wav"
436+
}
429437
},
430438
"DownOrRightButton": {
431439
"Bounds": "0,0,15,15",
@@ -453,7 +461,8 @@
453461
"DisabledTextColor": null,
454462
"TextAlign": "Center",
455463
"AutoSizeToContents": false,
456-
"Font": null,
464+
"FontName": null,
465+
"FontSize": null,
457466
"TextScale": 1.0,
458467
"NormalImage": null,
459468
"HoveredImage": null,
@@ -514,7 +523,8 @@
514523
"DisabledTextColor": null,
515524
"TextAlign": "Center",
516525
"AutoSizeToContents": false,
517-
"Font": null,
526+
"FontName": null,
527+
"FontSize": null,
518528
"TextScale": 1.0,
519529
"NormalImage": null,
520530
"HoveredImage": null,
@@ -551,9 +561,11 @@
551561
"HoveredImage": null,
552562
"ClickedImage": null,
553563
"DisabledImage": null,
554-
"HoverSound": null,
555-
"MouseUpSound": null,
556-
"MouseDownSound": null
564+
"_stateSoundNames": {
565+
"Hover": "octave-tap-resonant.wav",
566+
"MouseDown": "octave-tap-warm.wav",
567+
"MouseUp": "octave-tap-warm.wav"
568+
}
557569
},
558570
"DownOrRightButton": {
559571
"Bounds": "0,0,15,15",
@@ -581,7 +593,8 @@
581593
"DisabledTextColor": null,
582594
"TextAlign": "Center",
583595
"AutoSizeToContents": false,
584-
"Font": null,
596+
"FontName": null,
597+
"FontSize": null,
585598
"TextScale": 1.0,
586599
"NormalImage": null,
587600
"HoveredImage": null,
@@ -598,7 +611,8 @@
598611
"BackgroundTemplate": null,
599612
"ItemTextColor": "",
600613
"ItemHoveredTextColor": "",
601-
"ItemFont": null
614+
"ItemFontName": null,
615+
"ItemFontSize": 0
602616
},
603617
"_arrowIcon": {
604618
"Bounds": "176,6,15,15",
@@ -693,7 +707,8 @@
693707
"DisabledTextColor": null,
694708
"TextAlign": "Center",
695709
"AutoSizeToContents": false,
696-
"Font": null,
710+
"FontName": null,
711+
"FontSize": null,
697712
"TextScale": 1.0,
698713
"_stateSoundNames": {
699714
"Hover": "octave-tap-resonant.wav",
@@ -735,7 +750,8 @@
735750
"DisabledTextColor": null,
736751
"TextAlign": "Left, CenterV",
737752
"AutoSizeToContents": true,
738-
"Font": "sourcesansproblack,12",
753+
"FontName": "sourcesansproblack",
754+
"FontSize": 12,
739755
"TextScale": 1.0
740756
}
741757
}
@@ -787,7 +803,8 @@
787803
"DisabledTextColor": null,
788804
"TextAlign": "Center",
789805
"AutoSizeToContents": false,
790-
"Font": null,
806+
"FontName": null,
807+
"FontSize": null,
791808
"TextScale": 1.0,
792809
"_stateSoundNames": {
793810
"Hover": "octave-tap-resonant.wav",
@@ -829,7 +846,8 @@
829846
"DisabledTextColor": null,
830847
"TextAlign": "Left, CenterV",
831848
"AutoSizeToContents": true,
832-
"Font": "sourcesansproblack,12",
849+
"FontName": "sourcesansproblack",
850+
"FontSize": 12,
833851
"TextScale": 1.0
834852
}
835853
}
@@ -934,7 +952,8 @@
934952
"DisabledTextColor": null,
935953
"TextAlign": "Center",
936954
"AutoSizeToContents": false,
937-
"Font": null,
955+
"FontName": null,
956+
"FontSize": null,
938957
"TextScale": 1.0,
939958
"NormalImage": "button.arrow_left.normal.png",
940959
"HoveredImage": "button.arrow_left.hovered.png",
@@ -973,7 +992,8 @@
973992
"DisabledTextColor": null,
974993
"TextAlign": "Center",
975994
"AutoSizeToContents": false,
976-
"Font": null,
995+
"FontName": null,
996+
"FontSize": null,
977997
"TextScale": 1.0,
978998
"NormalImage": "button.arrow_right.normal.png",
979999
"HoveredImage": "button.arrow_right.hovered.png",
@@ -1015,9 +1035,7 @@
10151035
"HoveredImage": null,
10161036
"ClickedImage": null,
10171037
"DisabledImage": null,
1018-
"HoverSound": null,
1019-
"MouseUpSound": null,
1020-
"MouseDownSound": null,
1038+
"_stateSoundNames": {},
10211039
"Children": {
10221040
"_icon": {
10231041
"Bounds": "0,4,24,24",
@@ -1072,7 +1090,8 @@
10721090
"DisabledTextColor": null,
10731091
"TextAlign": "Left, Bottom",
10741092
"AutoSizeToContents": false,
1075-
"Font": "sourcesansproblack,14",
1093+
"FontName": "sourcesansproblack",
1094+
"FontSize": 14,
10761095
"TextScale": 1.0
10771096
},
10781097
"CloseButton": {
@@ -1101,7 +1120,8 @@
11011120
"DisabledTextColor": null,
11021121
"TextAlign": "Center",
11031122
"AutoSizeToContents": false,
1104-
"Font": null,
1123+
"FontName": null,
1124+
"FontSize": null,
11051125
"TextScale": 1.0,
11061126
"NormalImage": null,
11071127
"HoveredImage": null,

‎resources/gui/layouts/menu/SelectCharacterWindow.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,9 +470,7 @@
470470
"HoveredImage": null,
471471
"ClickedImage": null,
472472
"DisabledImage": null,
473-
"HoverSound": null,
474-
"MouseUpSound": null,
475-
"MouseDownSound": null,
473+
"_stateSoundNames": {},
476474
"Children": {
477475
"_icon": {
478476
"Bounds": "0,4,24,24",

0 commit comments

Comments
 (0)