Skip to content

Commit 24ab05c

Browse files
committed
fix: typo and UI of MenuBarView
- change label to `WolvenKit` instead of `Wolvenkit` - use `Margin` on all `MenuItem`s to uniformize UI - format XAML to follow guidelines
1 parent 1b2ebb9 commit 24ab05c

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

WolvenKit/Views/Shell/MenuBarView.xaml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -640,8 +640,6 @@
640640
</MenuItem>
641641
</MenuItem>
642642

643-
644-
645643
<!-- Tools -->
646644
<MenuItem
647645
Padding="{DynamicResource WolvenKitMarginHorizontal}"
@@ -861,15 +859,15 @@
861859
<MenuItem
862860
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
863861
Header="Creating mods">
864-
865862
<MenuItem.Icon>
866863
<local:IconBox
867864
IconPack="Empty"
868865
Size="{DynamicResource WolvenKitIconTiny}" />
869866
</MenuItem.Icon>
870867

871868
<MenuItem
872-
Header="Wolvenkit: Creating a Mod"
869+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
870+
Header="WolvenKit: Creating a Mod"
873871
Command="{Binding MainViewModel.OpenExternalLinkCommand}"
874872
CommandParameter="{Binding WikiLinks.WolvenKitCreatingAModGuide}">
875873
<MenuItem.Icon>
@@ -881,15 +879,17 @@
881879
</MenuItem>
882880

883881
<!-- Submenu: Adding new items -->
884-
<MenuItem Header="Adding new items">
885-
882+
<MenuItem
883+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
884+
Header="Adding new items">
886885
<MenuItem.Icon>
887886
<local:IconBox
888887
IconPack="Empty"
889888
Size="{DynamicResource WolvenKitIconTiny}" />
890889
</MenuItem.Icon>
891890

892891
<MenuItem
892+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
893893
Header="Adding new clothes"
894894
Command="{Binding MainViewModel.OpenExternalLinkCommand}"
895895
CommandParameter="{Binding WikiLinks.AddingNewItems}">
@@ -900,7 +900,9 @@
900900
Size="{DynamicResource WolvenKitIconTiny}" />
901901
</MenuItem.Icon>
902902
</MenuItem>
903+
903904
<MenuItem
905+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
904906
Header="Adding new weapons"
905907
Command="{Binding MainViewModel.OpenExternalLinkCommand}"
906908
CommandParameter="{Binding WikiLinks.AddingNewItems_Weapons}">
@@ -914,14 +916,17 @@
914916
</MenuItem>
915917

916918
<!-- Submenu: NPCs and V -->
917-
<MenuItem Header="NPCs and V">
918-
919+
<MenuItem
920+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
921+
Header="NPCs and V">
919922
<MenuItem.Icon>
920923
<local:IconBox
921924
IconPack="Empty"
922925
Size="{DynamicResource WolvenKitIconTiny}" />
923926
</MenuItem.Icon>
927+
924928
<MenuItem
929+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
925930
Command="{Binding MainViewModel.OpenExternalLinkCommand}"
926931
CommandParameter="{Binding WikiLinks.NPVs}"
927932
Header="V as NPC">
@@ -934,6 +939,7 @@
934939
</MenuItem>
935940

936941
<MenuItem
942+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
937943
Header="New NPCs for AMM"
938944
Command="{Binding MainViewModel.OpenExternalLinkCommand}"
939945
CommandParameter="{Binding WikiLinks.AMM_NPCs}">
@@ -946,6 +952,7 @@
946952
</MenuItem>
947953

948954
<MenuItem
955+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
949956
Header="Custom Tattoos"
950957
Command="{Binding MainViewModel.OpenExternalLinkCommand}"
951958
CommandParameter="{Binding WikiLinks.Tattoos}">
@@ -958,6 +965,7 @@
958965
</MenuItem>
959966

960967
<MenuItem
968+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
961969
Header="Hair"
962970
Command="{Binding MainViewModel.OpenExternalLinkCommand}"
963971
CommandParameter="{Binding WikiLinks.Hair}">
@@ -970,6 +978,7 @@
970978
</MenuItem>
971979

972980
<MenuItem
981+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
973982
Header="Character Creator Additions"
974983
Command="{Binding MainViewModel.OpenExternalLinkCommand}"
975984
CommandParameter="{Binding WikiLinks.CCXL}">
@@ -983,6 +992,7 @@
983992
</MenuItem>
984993

985994
<MenuItem
995+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
986996
Header="Changing the world"
987997
Command="{Binding MainViewModel.OpenExternalLinkCommand}"
988998
CommandParameter="{Binding WikiLinks.WorldEditing}">
@@ -997,6 +1007,7 @@
9971007
<Separator />
9981008

9991009
<MenuItem
1010+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
10001011
Header="Cheat Sheets"
10011012
Command="{Binding MainViewModel.OpenExternalLinkCommand}"
10021013
CommandParameter="{Binding WikiLinks.CheatSheets}">
@@ -1007,12 +1018,12 @@
10071018
Size="{DynamicResource WolvenKitIconTiny}" />
10081019
</MenuItem.Icon>
10091020
</MenuItem>
1010-
10111021
</MenuItem>
10121022

10131023
<Separator />
10141024

10151025
<MenuItem
1026+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
10161027
Header="Discord Invitation"
10171028
Command="{Binding MainViewModel.OpenExternalLinkCommand}"
10181029
CommandParameter="{Binding WikiLinks.DiscordInvite}">
@@ -1025,6 +1036,7 @@
10251036
</MenuItem>
10261037

10271038
<MenuItem
1039+
Margin="{DynamicResource WolvenKitMenuBarItemMarginHorizontal}"
10281040
Command="{Binding MainViewModel.OpenExternalLinkCommand}"
10291041
CommandParameter="{Binding WikiLinks.WolvenkitAbout}"
10301042
Header="About WolvenKit">

0 commit comments

Comments
 (0)