Bladeren bron

Adjusted sizing and moved examples to top

CPKreuz 1 jaar geleden
bovenliggende
commit
cee158a2d4

+ 41 - 41
src/PixiEditor.AvaloniaUI/Views/Windows/HelloTherePopup.axaml

@@ -79,6 +79,47 @@
 
                     <StackPanel Grid.Row="2" HorizontalAlignment="Center" Margin="0,30,0,0">
                         <TextBlock FontSize="23" FontWeight="SemiBold" HorizontalAlignment="Center"
+                                   ui:Translator.Key="BETA_EXAMPLE_FILES" />
+                        
+                        <ItemsControl ItemsSource="{Binding BetaExampleFiles}">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate DataType="{x:Type windows:BetaExampleFile}">
+                                    <Grid>
+                                        <StackPanel Margin="8,5,8,0">
+                                            <Button Margin="0,10,0,0" HorizontalAlignment="Center"
+                                                    Width="100" Height="100"
+                                                    Padding="0"
+                                                    Command="{Binding OpenBetaExampleCommand, RelativeSource={RelativeSource AncestorType=windows:HelloTherePopup}}"
+                                                    CommandParameter="{Binding}"
+                                                    x:Name="fileButton">
+                                                <Grid Width="100" Height="100">
+                                                    <visuals:SurfaceControl
+                                                        Surface="{Binding PreviewImage}"
+                                                        Margin="10"
+                                                        Stretch="Uniform"
+                                                        x:Name="image">
+                                                        <ui:RenderOptionsBindable.BitmapInterpolationMode>
+                                                            <MultiBinding
+                                                                Converter="{converters:WidthToBitmapScalingModeConverter}">
+                                                                <Binding Path="PreviewImage.Size.X" />
+                                                                <Binding ElementName="image" Path="Width" />
+                                                            </MultiBinding>
+                                                        </ui:RenderOptionsBindable.BitmapInterpolationMode>
+                                                    </visuals:SurfaceControl>
+                                                </Grid>
+                                            </Button>
+
+                                            <TextBlock ui:Translator.LocalizedString="{Binding DisplayName}"
+                                                       Width="110" TextAlignment="Center"
+                                                       TextTrimming="CharacterEllipsis"
+                                                       FontSize="18" Margin="10,10,10,2" HorizontalAlignment="Center" />
+                                        </StackPanel>
+                                    </Grid>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                        
+                        <TextBlock Margin="0,8,0,0" FontSize="23" FontWeight="SemiBold" HorizontalAlignment="Center"
                                    ui:Translator.Key="RECENT_FILES" />
                         <TextBlock Margin="0,12.5,0,0" Foreground="LightGray" HorizontalAlignment="Center"
                                    ui:Translator.Key="RECENT_EMPTY_TEXT">
@@ -255,47 +296,6 @@
                                 </ItemsPanelTemplate>
                             </ItemsControl.ItemsPanel>
                         </ItemsControl>
-                        
-                        <TextBlock FontSize="23" FontWeight="SemiBold" HorizontalAlignment="Center"
-                                   ui:Translator.Key="BETA_EXAMPLE_FILES" />
-                        
-                        <ItemsControl ItemsSource="{Binding BetaExampleFiles}">
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate DataType="{x:Type windows:BetaExampleFile}">
-                                    <Grid>
-                                        <StackPanel Margin="8,5,8,0">
-                                            <Button Margin="0,10,0,0" HorizontalAlignment="Center"
-                                                    Width="100" Height="100"
-                                                    Padding="0"
-                                                    Command="{Binding OpenBetaExampleCommand, RelativeSource={RelativeSource AncestorType=windows:HelloTherePopup}}"
-                                                    CommandParameter="{Binding}"
-                                                    x:Name="fileButton">
-                                                <Grid Width="100" Height="100">
-                                                    <visuals:SurfaceControl
-                                                        Surface="{Binding PreviewImage}"
-                                                        Margin="10"
-                                                        Stretch="Uniform"
-                                                        x:Name="image">
-                                                        <ui:RenderOptionsBindable.BitmapInterpolationMode>
-                                                            <MultiBinding
-                                                                Converter="{converters:WidthToBitmapScalingModeConverter}">
-                                                                <Binding Path="PreviewImage.Size.X" />
-                                                                <Binding ElementName="image" Path="Width" />
-                                                            </MultiBinding>
-                                                        </ui:RenderOptionsBindable.BitmapInterpolationMode>
-                                                    </visuals:SurfaceControl>
-                                                </Grid>
-                                            </Button>
-
-                                            <TextBlock ui:Translator.LocalizedString="{Binding DisplayName}"
-                                                       Width="110" TextAlignment="Center"
-                                                       TextTrimming="CharacterEllipsis"
-                                                       FontSize="18" Margin="10,10,10,2" HorizontalAlignment="Center" />
-                                        </StackPanel>
-                                    </Grid>
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                        </ItemsControl>
                     </StackPanel>
 
                     <panels:AlignableWrapPanel Grid.Row="3" HorizontalContentAlignment="Center"

+ 3 - 3
src/PixiEditor.AvaloniaUI/Views/Windows/HelloTherePopup.axaml.cs

@@ -141,17 +141,17 @@ internal partial class HelloTherePopup : PixiEditorPopup
         if (RecentlyOpenedEmpty)
         {
             Width = 500 + newsWidth;
-            Height = 500;
+            Height = 670;
         }
         else if (RecentlyOpened.Count < 4)
         {
             Width = 545 + newsWidth;
-            Height = 500;
+            Height = 670;
         }
         else if (RecentlyOpened.Count < 7)
         {
             Width = 575 + newsWidth;
-            Height = 670;
+            Height = 840;
         }
     }