Skip to content
This repository has been archived by the owner on Apr 25, 2022. It is now read-only.

Commit

Permalink
Remove border, add dialoghost for uninstall code. Will need to move i…
Browse files Browse the repository at this point in the history 
…t to only target the uninstall button

@Willster419 This is going to need some of your expertise. These DialogHosts are async and im not entirely sure how to get progress info into this. But I havnt tried yet...
  • Loading branch information
@Arkhorse
Arkhorse committed Aug 2, 2021
1 parent feef484 commit 400eb7b
Showing 1 changed file with 24 additions and 12 deletions.
36 changes: 24 additions & 12 deletions RelhaxModpack/RelhaxModpack/ModpackMainWindow_NEW.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
Closed="RelhaxWindow_Closed" Loaded="RelhaxWindow_Loaded"
Icon="/RelhaxModpack;component/Resources/modpack_icon.ico"
Title="Relhax Modpack" Height="720" Width="1280">
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Card.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Window.Resources>
<Grid>
<Grid x:Name="ModpackMainWindow_MinorSettings" Panel.ZIndex="1000">
<materialDesign:PopupBox
Expand Down Expand Up @@ -103,18 +111,22 @@
Style="{StaticResource MaterialDesignHeadline4TextBlock}"
TextWrapping="Wrap"
Text="Welcome to the Relhax Modpack"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="42">
<Border Style="{StaticResource MaterialDesignToolBarMainPanelBorderStyle}" BorderThickness="2" BorderBrush="White">
<materialDesign:DialogHost>
<materialDesign:DialogHost.DialogContent>
<!-- This will be where the Uninstall progress will be displayed. Not finished -->
<StackPanel>

</StackPanel>
</materialDesign:DialogHost.DialogContent>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="42">
<Button
Style="{StaticResource MaterialDesignFlatButton}">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Play" Width="40" Height="40" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBlock Margin="8 0 0 0" Text="Install" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</Border>
<Border Style="{StaticResource MaterialDesignToolBarMainPanelBorderStyle}" BorderThickness="2" BorderBrush="White">
<Button
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Play" Width="40" Height="40" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<TextBlock Margin="8 0 0 0" Text="Install" VerticalAlignment="Center"/>
</StackPanel>
</Button>
<Button
x:Name="ModpackMainpage_UninstallButton"
Style="{StaticResource MaterialDesignFlatButton}"
Click="ModpackMainpage_UninstallButton_Click">
Expand All @@ -123,8 +135,8 @@
<TextBlock Margin="0" Text="Uninstall" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</Border>
</StackPanel>
</StackPanel>
</materialDesign:DialogHost>
</StackPanel>
</Grid>
<Grid x:Name="ModpackManWindow_Home_LanguageSelection" Grid.Row="2">
Expand Down

1 comment on commit 400eb7b

@Willster419
Copy link
Owner

@Willster419 Willster419 commented on 400eb7b Aug 3, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make an issue for it (or else i'll forget)

Please sign in to comment.