Skip to content

Commit 7fe4732

Browse files
MattEqualsCoderMattEqualsCoder
authored
Merge pull request #698 from TheTrackerCouncil/scroll-locations-window
Update locations window to have a full window scrollbar
2 parents 298a7af + 573bd64 commit 7fe4732

File tree

1 file changed

+53
-53
lines changed

1 file changed

+53
-53
lines changed

‎src/TrackerCouncil.Smz3.UI/Views/TrackerLocationsWindow.axaml‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -12,61 +12,61 @@
1212
Icon="/Assets/smz3.ico"
1313
Title="Tracker Locations — SMZ3 Cas' Randomizer">
1414
<LayoutTransformControl x:Name="MainLayout">
15-
<DockPanel IsVisible="{Binding FinishedLoading}">
16-
<StackPanel Orientation="Vertical" DockPanel.Dock="Top" Margin="5">
17-
<TextBlock Text="Marked locations" FontSize="20"/>
18-
<ItemsControl ItemsSource="{Binding MarkedLocations}" Margin="5 10">
19-
<ItemsControl.ItemTemplate>
20-
<DataTemplate>
21-
<Grid RowDefinitions="Auto,Auto" ColumnDefinitions="32,7,*" Margin="2">
15+
<ScrollViewer>
16+
<DockPanel IsVisible="{Binding FinishedLoading}">
17+
<StackPanel Orientation="Vertical" DockPanel.Dock="Top" Margin="5">
18+
<TextBlock Text="Marked locations" FontSize="20"/>
19+
<ItemsControl ItemsSource="{Binding MarkedLocations}" Margin="5 10">
20+
<ItemsControl.ItemTemplate>
21+
<DataTemplate>
22+
<Grid RowDefinitions="Auto,Auto" ColumnDefinitions="32,7,*" Margin="2">
2223

23-
<Image Grid.Row="0" Source="{Binding ItemSprite, Converter={StaticResource StringToImageConverter}}"
24-
Opacity="{Binding Opacity}"
25-
Grid.RowSpan="2"
26-
Grid.Column="0" />
24+
<Image Grid.Row="0" Source="{Binding ItemSprite, Converter={StaticResource StringToImageConverter}}"
25+
Opacity="{Binding Opacity}"
26+
Grid.RowSpan="2"
27+
Grid.Column="0" />
2728

28-
<TextBlock Text="{Binding LocationName}"
29-
Grid.Row="0"
30-
Grid.Column="2"
31-
Opacity="{Binding Opacity}"
32-
TextTrimming="CharacterEllipsis"
33-
FontWeight="Bold" />
34-
<TextBlock Text="{Binding Area}"
35-
Grid.Row="1"
36-
Grid.Column="2"
37-
TextTrimming="CharacterEllipsis"
38-
Opacity="{Binding Opacity}" />
39-
</Grid>
40-
</DataTemplate>
41-
</ItemsControl.ItemTemplate>
42-
</ItemsControl>
29+
<TextBlock Text="{Binding LocationName}"
30+
Grid.Row="0"
31+
Grid.Column="2"
32+
Opacity="{Binding Opacity}"
33+
TextTrimming="CharacterEllipsis"
34+
FontWeight="Bold" />
35+
<TextBlock Text="{Binding Area}"
36+
Grid.Row="1"
37+
Grid.Column="2"
38+
TextTrimming="CharacterEllipsis"
39+
Opacity="{Binding Opacity}" />
40+
</Grid>
41+
</DataTemplate>
42+
</ItemsControl.ItemTemplate>
43+
</ItemsControl>
4344

44-
<TextBlock Text="Viewed Hints" Margin="0 0 0 0" FontSize="20"/>
45-
<ItemsControl ItemsSource="{Binding HintTiles}"
46-
BorderThickness="0"
47-
Margin="10 10">
48-
<ItemsControl.ItemTemplate>
49-
<DataTemplate>
50-
<StackPanel Orientation="Horizontal" Opacity="{Binding Opacity}" IsVisible="{Binding IsVisible}">
51-
<TextBlock Text="{Binding Name}"
52-
FontWeight="Bold" />
53-
<TextBlock Margin="0 0 5 0">: </TextBlock>
54-
<TextBlock Text="{Binding Quality}" />
55-
</StackPanel>
56-
</DataTemplate>
57-
</ItemsControl.ItemTemplate>
58-
</ItemsControl>
45+
<TextBlock Text="Viewed Hints" Margin="0 0 0 0" FontSize="20"/>
46+
<ItemsControl ItemsSource="{Binding HintTiles}"
47+
BorderThickness="0"
48+
Margin="10 10">
49+
<ItemsControl.ItemTemplate>
50+
<DataTemplate>
51+
<StackPanel Orientation="Horizontal" Opacity="{Binding Opacity}" IsVisible="{Binding IsVisible}">
52+
<TextBlock Text="{Binding Name}"
53+
FontWeight="Bold" />
54+
<TextBlock Margin="0 0 5 0">: </TextBlock>
55+
<TextBlock Text="{Binding Quality}" />
56+
</StackPanel>
57+
</DataTemplate>
58+
</ItemsControl.ItemTemplate>
59+
</ItemsControl>
5960

60-
<Grid ColumnDefinitions="*, Auto, Auto, Auto">
61-
<TextBlock Text="All locations" FontSize="20" Margin="0" Grid.Column="0" />
62-
<CheckBox Content="Show out-of-logic" VerticalAlignment="Center" Grid.Column="1" Margin="15 0" IsChecked="{Binding ShowOutOfLogic}" IsCheckedChanged="ToggleShowOutOfLogicButton_OnIsCheckedChanged" />
63-
<TextBlock Grid.Column="2" VerticalAlignment="Center" Margin="5 0">Filter:</TextBlock>
64-
<controls:EnumComboBox Grid.Column="3" MinWidth="100" Value="{Binding Filter}" EnumType="{Binding Filter, Converter={StaticResource TypeConverter}}" ValueChanged="FilterComboBox_OnValueChanged" />
65-
</Grid>
66-
</StackPanel>
61+
<Grid ColumnDefinitions="*, Auto, Auto, Auto">
62+
<TextBlock Text="All locations" FontSize="20" Margin="0" Grid.Column="0" />
63+
<CheckBox Content="Show out-of-logic" VerticalAlignment="Center" Grid.Column="1" Margin="15 0" IsChecked="{Binding ShowOutOfLogic}" IsCheckedChanged="ToggleShowOutOfLogicButton_OnIsCheckedChanged" />
64+
<TextBlock Grid.Column="2" VerticalAlignment="Center" Margin="5 0">Filter:</TextBlock>
65+
<controls:EnumComboBox Grid.Column="3" MinWidth="100" Value="{Binding Filter}" EnumType="{Binding Filter, Converter={StaticResource TypeConverter}}" ValueChanged="FilterComboBox_OnValueChanged" />
66+
</Grid>
67+
</StackPanel>
6768

68-
<Grid Margin="5">
69-
<ScrollViewer>
69+
<Grid Margin="5">
7070
<ItemsControl ItemsSource="{Binding Regions}" Margin="10 0">
7171
<ItemsControl.ItemTemplate>
7272
<DataTemplate>
@@ -95,9 +95,9 @@
9595
</DataTemplate>
9696
</ItemsControl.ItemTemplate>
9797
</ItemsControl>
98-
</ScrollViewer>
99-
</Grid>
100-
</DockPanel>
98+
</Grid>
99+
</DockPanel>
100+
</ScrollViewer>
101101
</LayoutTransformControl>
102102
</Window>
103103

0 commit comments

Comments
 (0)