Skip to content

Commit

Permalink
Merge pull request bsmg#343 from megalon/fix/scrollbars
Browse files Browse the repository at this point in the history 
Add ScrollViewer for non Mod pages
  • Loading branch information
@luludotdev
luludotdev authored May 16, 2021
2 parents 50c7b7a + d5c5e23 commit 8b59a3f
Show file tree
Hide file tree
Showing 5 changed files with 271 additions and 262 deletions.
3 changes: 2 additions & 1 deletion ModAssistant/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
Icon="Resources/icon.ico"
SizeChanged="Window_SizeChanged"
UIElement.PreviewMouseDown="Window_PreviewMouseDown"
mc:Ignorable="d">
mc:Ignorable="d"
MinWidth="800" MinHeight="430">
<Grid>
<Rectangle Fill="{DynamicResource ModAssistantBackground}" />
<Rectangle>
Expand Down
188 changes: 95 additions & 93 deletions ModAssistant/Pages/About.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,244 +12,245 @@
d:DesignWidth="1182"
mc:Ignorable="d">

<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />

</Grid.RowDefinitions>
</Grid.RowDefinitions>

<TextBlock
<TextBlock
Margin="0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
FontSize="24"
Text="{DynamicResource About:PageTitle}" />
<TextBlock
<TextBlock
Grid.Row="1"
Margin="0,5"
FontSize="16"
Text="{DynamicResource About:List:Header}"
TextWrapping="Wrap" />
<TextBlock
<TextBlock
Grid.Row="2"
Margin="15,5"
FontSize="16">
•
<TextBlock Text="{DynamicResource About:List:Item1}" />
</TextBlock>
<TextBlock
<TextBlock
Grid.Row="3"
Margin="15,5"
FontSize="16">
•
<TextBlock Text="{DynamicResource About:List:Item2}" />
</TextBlock>
<TextBlock
<TextBlock
Grid.Row="4"
Margin="15,5"
FontSize="16">
•
<TextBlock Text="{DynamicResource About:List:Item3}" />
</TextBlock>
<TextBlock
<TextBlock
Grid.Row="5"
Margin="15,5"
FontSize="16">
•
<TextBlock Text="{DynamicResource About:List:Item4}" />
</TextBlock>

<TextBlock
<TextBlock
Grid.Row="6"
Margin="0,5,5,5"
FontSize="16"
TextWrapping="Wrap">
<StaticResource ResourceKey="About:SupportAssistant" />
</TextBlock>
</TextBlock>

<TextBlock
<TextBlock
Grid.Row="7"
Margin="0,10,5,5"
FontSize="20"
Text="{DynamicResource About:SpecialThanks}" />

<StackPanel
<StackPanel
Grid.Row="8"
HorizontalAlignment="Center"
Orientation="Horizontal">

<StackPanel Margin="10" Orientation="Vertical">
<TextBlock
<StackPanel Margin="10" Orientation="Vertical">
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="20"
FontWeight="Bold">
<Hyperlink NavigateUri="https://umbranox.carrd.co/" RequestNavigate="Hyperlink_RequestNavigate">
Umbranox
</Hyperlink>
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
Inspiration
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
Creating the Mod Manager
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
<Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/scoresaber">
<Run Text="{DynamicResource About:Donate}" />
</Hyperlink>
</TextBlock>
</StackPanel>
</TextBlock>
</StackPanel>

<StackPanel Margin="10" Orientation="Vertical">
<TextBlock
<StackPanel Margin="10" Orientation="Vertical">
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="20"
FontWeight="Bold">
<Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.jackbaron.com/">
lolPants
</Hyperlink>
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
Inspiration
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
Creating ModSaber
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
The first Mod repository
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
<Hyperlink NavigateUri="https://www.paypal.me/jackbarondev" RequestNavigate="Hyperlink_RequestNavigate">
<Run Text="{DynamicResource About:Donate}" />
</Hyperlink>
</TextBlock>
</StackPanel>
</TextBlock>
</StackPanel>

<StackPanel Margin="10" Orientation="Vertical">
<TextBlock
<StackPanel Margin="10" Orientation="Vertical">
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="20"
FontWeight="Bold">
<Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.github.com/Caeden117">
Caeden117
</Hyperlink>
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
Theme Support
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
<Hyperlink NavigateUri="https://ko-fi.com/Caeden117" RequestNavigate="Hyperlink_RequestNavigate">
<Run Text="{DynamicResource About:Donate}" />
</Hyperlink>
</TextBlock>
</StackPanel>
</TextBlock>
</StackPanel>

<StackPanel Margin="10" Orientation="Vertical">
<TextBlock
<StackPanel Margin="10" Orientation="Vertical">
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="20"
FontWeight="Bold">
<Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://twitter.com/moarinterz">
Interz
</Hyperlink>
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
Logos and icon design
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
<Hyperlink NavigateUri="https://streamlabs.com/lnterz/tip" RequestNavigate="Hyperlink_RequestNavigate">
<Run Text="{DynamicResource About:Donate}" />
</Hyperlink>
</TextBlock>
</StackPanel>
</TextBlock>
</StackPanel>

<StackPanel Margin="10" Orientation="Vertical">
<TextBlock
<StackPanel Margin="10" Orientation="Vertical">
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="20"
FontWeight="Bold">
<Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://github.com/megalon">
Megalon2D
</Hyperlink>
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
BSMG Theme
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
Lots of fixes
</TextBlock>
<TextBlock
</TextBlock>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16">
<Hyperlink NavigateUri="https://ko-fi.com/megalon" RequestNavigate="Hyperlink_RequestNavigate">
<Run Text="{DynamicResource About:Donate}" />
</Hyperlink>
</TextBlock>
</StackPanel>
</TextBlock>
</StackPanel>

</StackPanel>
<StackPanel
</StackPanel>
<StackPanel
Grid.Row="9"
Margin="5"
HorizontalAlignment="Center"
Orientation="Horizontal">
<Button
<Button
x:Name="PatButton"
Height="30"
MinWidth="80"
Expand All @@ -258,7 +259,7 @@
x:FieldModifier="public"
Click="HeadpatsButton_Click"
Content="{DynamicResource About:HeadpatsButton}" />
<Button
<Button
x:Name="HugButton"
Height="30"
MinWidth="80"
Expand All @@ -267,28 +268,29 @@
x:FieldModifier="public"
Click="HugsButton_Click"
Content="{DynamicResource About:HugsButton}" />
</StackPanel>
<Popup
</StackPanel>
<Popup
x:Name="PatUp"
Width="auto"
Height="auto"
Placement="Center">
<Border BorderBrush="Gray" BorderThickness="3">
<wfi:WindowsFormsHost>
<winForms:PictureBox x:Name="PatImage" />
</wfi:WindowsFormsHost>
</Border>
</Popup>
<Popup
<Border BorderBrush="Gray" BorderThickness="3">
<wfi:WindowsFormsHost>
<winForms:PictureBox x:Name="PatImage" />
</wfi:WindowsFormsHost>
</Border>
</Popup>
<Popup
x:Name="HugUp"
Width="auto"
Height="auto"
Placement="Center">
<Border BorderBrush="Gray" BorderThickness="3">
<wfi:WindowsFormsHost>
<winForms:PictureBox x:Name="HugImage" />
</wfi:WindowsFormsHost>
</Border>
</Popup>
</Grid>
<Border BorderBrush="Gray" BorderThickness="3">
<wfi:WindowsFormsHost>
<winForms:PictureBox x:Name="HugImage" />
</wfi:WindowsFormsHost>
</Border>
</Popup>
</Grid>
</ScrollViewer>
</Page>
Loading

0 comments on commit 8b59a3f

Please sign in to comment.