Skip to content

New Splash window #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2025
Merged

New Splash window #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Pixed.Application/App.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
<ResourceInclude Source="/Themes/ToolRadio.axaml"/>
<ResourceInclude Source="/Themes/ToolRadioCustom.axaml"/>
<ResourceInclude Source="/Themes/TopLevelMenuItem.axaml"/>
<ResourceInclude Source="avares://LoadingIndicators.Avalonia/LoadingIndicators.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
<Application.Styles>
<SimpleTheme/>
<templates:PixiPerfectColorPickerTheme />
<FluentTheme />
<StyleInclude Source="avares://AvaloniaProgressRing/Styles/ProgressRing.xaml"/>
<StyleInclude Source="/Styles.axaml"/>
<StyleInclude Source="avares://AvaloniaInside.Shell/Default.axaml"></StyleInclude>
</Application.Styles>
Expand Down
2 changes: 1 addition & 1 deletion Pixed.Application/Pixed.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PackageReference Include="Avalonia.Themes.Simple" Version="11.3.0" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.3.0" />
<PackageReference Include="AvaloniaInside.Shell" Version="1.3.1" />
<PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.10.10" />
<PackageReference Include="LoadingIndicators.Avalonia" Version="11.0.11.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="PixiEditor.ColorPicker.AvaloniaUI" Version="1.0.7" />
Expand Down
26 changes: 13 additions & 13 deletions Pixed.Application/Windows/SplashWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,33 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:progRing="clr-namespace:AvaloniaProgressRing;assembly=AvaloniaProgressRing"
xmlns:li="using:LoadingIndicators.Avalonia"
xmlns:viewModels="clr-namespace:Pixed.Application.ViewModels;assembly=Pixed.Application"
mc:Ignorable="d"
x:Class="Pixed.Application.Windows.SplashWindow"
x:DataType="viewModels:AboutViewModel"
Title="SplashWindow"
ShowInTaskbar="False"
SystemDecorations="None"
ShowInTaskbar="False"
SystemDecorations="None"
CanResize="False"
WindowStartupLocation="CenterScreen"
Width="200"
Height="300"
Width="600"
Height="320"
CornerRadius="16"
Background="Transparent">
<Window.DataContext>
<viewModels:AboutViewModel/>
</Window.DataContext>
<Border CornerRadius="16" Background="{StaticResource Accent}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="200"/>
<RowDefinition Height="20"/>
<RowDefinition Height="100"/>
</Grid.RowDefinitions>
<Image Source="/Resources/icon256.png" Width="200" Height="200"/>
<progRing:ProgressRing Width="70"
Height="70"
IsActive="True"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="White"
Margin="10,20,0,0"
Grid.Row="1"/>
<TextBlock Text="{Binding AppVersion}" Foreground="White" Grid.Row="1" TextAlignment="Center"/>
<li:LoadingIndicator IsActive="true" Mode="ThreeDots" SpeedRatio="1.2" Grid.Row="2" Foreground="White" Width="100" Height="100"/>
</Grid>
</Border>
</Window>
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ Your imagination and **Pixed**. These two things are needed for pixel-arted imag
## Stack
- .NET 8
- Avalonia [AvaloniaUI/avalonia](https://github.com/avaloniaui/avalonia)
- SkiaSharp [mono/SkiaSharp](https://github.com/mono/SkiaSharp)
- BigGustave (Modified in Pixed.BigGustave) [EliotJones/BigGustave](https://github.com/EliotJones/BigGustave)
- Microsoft.Extensions.DependencyInjection [NuGet](https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection)
- Newtonsoft.JSON [JamesNK/Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json)
- PixiEditor.ColorPicker [PixiEditor/ColorPicker](https://github.com/PixiEditor/ColorPicker)
- System.Reactive (RX) [dotnet/reactive](https://github.com/dotnet/reactive)
- LZMA SDK [Mateusz-Nejman/LZMA_SDK](https://github.com/Mateusz-Nejman/LZMA_SDK)
- AvaloniaProgressRing [Deadpikle/AvaloniaProgressRing](https://github.com/Deadpikle/AvaloniaProgressRing)
- SkiaSharp [mono/SkiaSharp](https://github.com/mono/SkiaSharp)
- BigGustave (Modified in Pixed.BigGustave) [EliotJones/BigGustave](https://github.com/EliotJones/BigGustave)
- AvaloniaProgressRing [moviegear/LoadingIndicators.Avalonia](https://github.com/moviegear/LoadingIndicators.Avalonia/)
- WiX Toolset [wixtoolset/wix](https://github.com/wixtoolset/wix)
- Svg.Skia [wieslawsoltes/Svg.Skia](https://github.com/wieslawsoltes/Svg.Skia)

Expand Down
Loading