Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Knossos.NET/Views/CommunityView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<TabControl>
<TabItem Header="Resources">
<ScrollViewer>
<ScrollViewer AllowAutoHide="False">
<StackPanel HorizontalAlignment="Left" MinWidth="680" MaxWidth="900" Margin="40,20,20,10">
<Button HorizontalAlignment="Stretch" ToolTip.Tip="Hard Light Productions Discord - Permanent Invitation: https://discord.gg/cyhMBhMHzK" Classes="CommunityLink">
<WrapPanel Margin="10,10,15,10">
Expand Down
16 changes: 8 additions & 8 deletions Knossos.NET/Views/DeveloperModsView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@
<vm:DeveloperModsViewModel/>
</Design.DataContext>

<ScrollViewer HorizontalScrollBarVisibility="Visible">
<TabControl Margin="10" SelectedIndex="{Binding TabIndex}">
<ScrollViewer HorizontalScrollBarVisibility="Auto" AllowAutoHide="False">
<TabControl Margin="5" SelectedIndex="{Binding TabIndex}">
<TabItem Header="Mods">
<SplitView MinWidth="1000" Margin="0,0,0,5" IsPaneOpen="True" DisplayMode="CompactInline" CompactPaneLength="100" OpenPaneLength="300">
<SplitView Margin="0,0,0,5" IsPaneOpen="True" DisplayMode="CompactInline" CompactPaneLength="100" OpenPaneLength="280">
<SplitView.Pane>
<Grid RowDefinitions="Auto,*,Auto,Auto,Auto">

<Button Command="{Binding CreateMod}" Grid.Row="0" Margin="5,5,0,5" HorizontalAlignment="Left">Create New Mod</Button>
<ComboBox SelectedIndex="{Binding SortSelectedIndex}" ItemsSource="{Binding SortBoxItems}" Grid.Row="0" Margin="0,5,5,5" Width="150" HorizontalAlignment="Right" ToolTip.Tip="Sort Type"></ComboBox>
<ComboBox SelectedIndex="{Binding SortSelectedIndex}" ItemsSource="{Binding SortBoxItems}" Grid.Row="0" Margin="0,5,5,5" Width="130" HorizontalAlignment="Right" ToolTip.Tip="Sort Type"></ComboBox>

<ListBox Grid.Row="1" ItemsSource="{Binding Mods}" SelectedIndex="{Binding SelectedIndex}">
<ListBox.ItemTemplate>
<DataTemplate>
<WrapPanel>
<Label FontWeight="Bold" Content="["/>
<Label FontWeight="Bold" Content="{Binding type}"/>
<Label FontWeight="Bold" Content="]"/>
<Label Content="{Binding title, Converter={StaticResource escapeUnderscoresConverter}}"/>
<Label FontSize="13" FontWeight="Bold" Content="["/>
<Label FontSize="13" FontWeight="Bold" Content="{Binding type}"/>
<Label FontSize="13" FontWeight="Bold" Content="]"/>
<Label FontSize="13" Content="{Binding title, Converter={StaticResource escapeUnderscoresConverter}}"/>
</WrapPanel>
</DataTemplate>
</ListBox.ItemTemplate>
Expand Down
2 changes: 1 addition & 1 deletion Knossos.NET/Views/GlobalSettingsView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<Button Margin="0,5,30,0" Command="{Binding ResetCommand}" FontWeight="Bold" FontSize="20" ToolTip.Tip="Reset all settings to defaults" Classes="Cancel">Reset to defaults</Button>
<Button Margin="0,5,30,0" Command="{Binding ReloadFlagData}" FontSize="20" ToolTip.Tip="Reload all settings from the configuration file and reload system data.">Reload Data</Button>
</WrapPanel>
<ScrollViewer Grid.Row="1">
<ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Auto" AllowAutoHide="False">
<StackPanel>
<!--KNOSSOS SETTINGS-->
<Expander IsExpanded="{Binding ExpandKnossosSettings}" VerticalAlignment="Top" Margin="5" MinWidth="740">
Expand Down
2 changes: 1 addition & 1 deletion Knossos.NET/Views/ModListView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
</Button>
</WrapPanel>
</Grid>
<ScrollViewer Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<ScrollViewer Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" AllowAutoHide="False">
<StackPanel>
<StackPanel IsVisible="{Binding Sorting}">
<v:LoadingIconView Width="80" Height="80" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="50,50,0,0" Content="{Binding LoadingAnimation}"/>
Expand Down
2 changes: 1 addition & 1 deletion Knossos.NET/Views/NebulaModListView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</Button>
</WrapPanel>
</Grid>
<ScrollViewer Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<ScrollViewer Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" AllowAutoHide="False">
<StackPanel>
<StackPanel IsVisible="{Binding !ShowTiles}">
<v:LoadingIconView Width="80" Height="80" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="50,50,0,0" Content="{Binding LoadingAnimation}"/>
Expand Down
2 changes: 1 addition & 1 deletion Knossos.NET/Views/PxoView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<vm:PxoViewModel/>
</Design.DataContext>

<ScrollViewer>
<ScrollViewer HorizontalScrollBarVisibility="Auto" AllowAutoHide="False">
<StackPanel Margin="5">

<Grid ColumnDefinitions="*,Auto" Margin="5">
Expand Down
2 changes: 1 addition & 1 deletion Knossos.NET/Views/TaskView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</Design.DataContext>

<Grid Margin="5">
<ScrollViewer VerticalAlignment="Stretch" HorizontalAlignment="Stretch" HorizontalScrollBarVisibility="Auto">
<ScrollViewer VerticalAlignment="Stretch" HorizontalAlignment="Stretch" HorizontalScrollBarVisibility="Auto" AllowAutoHide="False">
<Grid RowDefinitions="Auto,*" HorizontalAlignment="Stretch">
<Button IsVisible="{Binding ButtonsVisible}" HorizontalAlignment="Left" Grid.Row="0" Margin="5" Command="{Binding CleanCommand}" ToolTip.Tip="Clean completed or cancelled tasks">
<Image Width="30" Height="30" Source="avares://Knossos.NET/Assets/general/clean.png"/>
Expand Down
2 changes: 1 addition & 1 deletion Knossos.NET/Views/Windows/ModDetailsView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<cvt:BitmapAssetValueConverter x:Key="imageConverter"/>
</Window.Resources>

<ScrollViewer Background="{StaticResource BackgroundColorPrimary}">
<ScrollViewer Background="{StaticResource BackgroundColorPrimary}" AllowAutoHide="False">
<Grid RowDefinitions="Auto,Auto,*,Auto">
<StackPanel Grid.Row="0" Margin="25">
<Image Source="{Binding Banner, Converter={StaticResource imageConverter}}" anim:ImageBehavior.AnimatedSource="{Binding ApngBanner}" HorizontalAlignment="Stretch" Height="300" IsVisible="{Binding HasBanner}"></Image>
Expand Down
2 changes: 1 addition & 1 deletion Knossos.NET/Views/Windows/ModSettingsView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<Grid Background="{StaticResource BackgroundColorPrimary}">
<Grid RowDefinitions="*,Auto">
<ScrollViewer Grid.Row="0">
<ScrollViewer Grid.Row="0" AllowAutoHide="False">
<StackPanel>
<!--Compression-->
<Label Margin="0,5,0,0" FontWeight="Black" FontSize="20">DISK USAGE</Label>
Expand Down
2 changes: 1 addition & 1 deletion Knossos.NET/Views/Windows/QuickSetupView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<vm:QuickSetupViewModel/>
</Design.DataContext>

<ScrollViewer>
<ScrollViewer AllowAutoHide="False">
<Grid Background="{StaticResource BackgroundColorPrimary}" HorizontalAlignment="Stretch" RowDefinitions="*,Auto">

<!--Page1-->
Expand Down
2 changes: 1 addition & 1 deletion Knossos.NET/Views/Windows/ServerCreatorView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<vm:ServerCreatorViewModel/>
</Design.DataContext>

<ScrollViewer Background="{StaticResource BackgroundColorPrimary}">
<ScrollViewer Background="{StaticResource BackgroundColorPrimary}" HorizontalScrollBarVisibility="Auto" AllowAutoHide="False">
<StackPanel>
<Label HorizontalAlignment="Center" FontWeight="Bold" FontSize="22">Select a mod</Label>
<ComboBox MinWidth="400" HorizontalAlignment="Center" SelectedIndex="{Binding ModIndex}" ItemsSource="{Binding ListOfMods}"></ComboBox>
Expand Down