michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-25 21:07:20 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ux: layout of floating panels (commands and notifications) (#659)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2024-11-07 11:07:47 +08:00
parent 88cec05e67
commit 45f4a5a4b1
No known key found for this signature in database
2 changed files with 90 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

180
src/Views/LauncherPage.axaml
View file

@ -5,6 +5,7 @@
xmlns:m="using:SourceGit.Models" xmlns:m="using:SourceGit.Models"
xmlns:v="using:SourceGit.Views" xmlns:v="using:SourceGit.Views"
xmlns:vm="using:SourceGit.ViewModels" xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.LauncherPage" x:Class="SourceGit.Views.LauncherPage"
x:DataType="vm:LauncherPage"> x:DataType="vm:LauncherPage">
@ -38,103 +39,100 @@
</ContentControl.DataTemplates> </ContentControl.DataTemplates>
</ContentControl> </ContentControl>
</Border> </Border>
<!-- Popup -->
<Grid Grid.Row="1" IsVisible="{Binding Popup, Converter={x:Static ObjectConverters.IsNotNull}}" ClipToBounds="True">
<Border Background="Transparent" PointerPressed="OnPopupCancelByClickMask"/>
<Border Width="500" HorizontalAlignment="Center" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #8F000000)" CornerRadius="0,0,8,8" ClipToBounds="True"> <!-- Floating -->
<ContentControl Content="{Binding Popup}" Background="{DynamicResource Brush.Popup}"> <Grid Grid.Row="1" ClipToBounds="True">
<ContentControl.DataTemplates> <Grid.IsVisible>
<DataTemplate DataType="vm:Popup"> <MultiBinding Converter="{x:Static BoolConverters.Or}">
<StackPanel Orientation="Vertical" Background="{DynamicResource Brush.Popup}"> <Binding Path="Popup" Converter="{x:Static ObjectConverters.IsNotNull}"/>
<!-- Popup Widget --> <Binding Path="Notifications.Count" Converter="{x:Static c:IntConverters.IsGreaterThanZero}"/>
<ContentPresenter Margin="8,16,8,8" </MultiBinding>
Content="{Binding View}" </Grid.IsVisible>
IsHitTestVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}"/>
<!-- Options --> <Border Background="Transparent"
<StackPanel Margin="8,4,8,8" PointerPressed="OnMaskClicked"
Height="32" IsVisible="{Binding Popup, Converter={x:Static ObjectConverters.IsNotNull}}"/>
Orientation="Horizontal"
HorizontalAlignment="Right" <Grid RowDefinitions="Auto,*" Width="512" HorizontalAlignment="Center">
IsVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}"> <!-- Popup -->
<Button Classes="flat primary" <Border Grid.Row="0"
Width="80" Height="28" Margin="6,0"
Padding="0" Effect="drop-shadow(0 0 8 #8F000000)"
HorizontalContentAlignment="Center" CornerRadius="0,0,8,8"
VerticalContentAlignment="Center" ClipToBounds="True"
Content="{DynamicResource Text.Sure}" IsVisible="{Binding Popup, Converter={x:Static ObjectConverters.IsNotNull}}">
Click="OnPopupSure" <ContentControl Content="{Binding Popup}" Background="{DynamicResource Brush.Popup}">
HotKey="Enter"/> <ContentControl.DataTemplates>
<Button Classes="flat" <DataTemplate DataType="vm:Popup">
Width="80" Height="28" <StackPanel Orientation="Vertical" Background="{DynamicResource Brush.Popup}">
Margin="8,0,0,0" <!-- Popup Widget -->
Padding="0" <ContentPresenter Margin="8,16,8,8"
HorizontalContentAlignment="Center" Content="{Binding View}"
VerticalContentAlignment="Center" IsHitTestVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}"/>
Content="{DynamicResource Text.Cancel}"
Click="OnPopupCancel"/> <!-- Options -->
<StackPanel Margin="8,4,8,8"
Height="32"
Orientation="Horizontal"
HorizontalAlignment="Right"
IsVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}">
<Button Classes="flat primary"
Width="80" Height="28"
Padding="0"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{DynamicResource Text.Sure}"
Click="OnPopupSure"
HotKey="Enter"/>
<Button Classes="flat"
Width="80" Height="28"
Margin="8,0,0,0"
Padding="0"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{DynamicResource Text.Cancel}"
Click="OnPopupCancel"/>
</StackPanel>
<!-- Running -->
<v:PopupRunningStatus Margin="12,8"
Description="{Binding ProgressDescription}"
IsVisible="{Binding InProgress}"/>
</StackPanel> </StackPanel>
</DataTemplate>
</ContentControl.DataTemplates>
</ContentControl>
</Border>
<!-- Running --> <!-- Notifications -->
<v:PopupRunningStatus Margin="12,8" <ScrollViewer Grid.Row="1" Margin="0,6,0,0" VerticalAlignment="Top" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
Description="{Binding ProgressDescription}" <ItemsControl ItemsSource="{Binding Notifications}">
IsVisible="{Binding InProgress}"/> <ItemsControl.ItemTemplate>
</StackPanel> <DataTemplate DataType="m:Notification">
</DataTemplate> <Border Margin="6" HorizontalAlignment="Stretch" VerticalAlignment="Top" Effect="drop-shadow(0 0 12 #A0000000)">
</ContentControl.DataTemplates> <Border Padding="8" CornerRadius="6" Background="{DynamicResource Brush.Popup}">
</ContentControl> <Grid RowDefinitions="26,Auto">
</Border> <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Margin="8,0">
</Grid> <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Error}" Fill="Red" IsVisible="{Binding IsError}"/>
<Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="Green" IsVisible="{Binding !IsError}"/>
<!-- Notification --> <TextBlock Grid.Column="1" Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.Launcher.Error}" IsVisible="{Binding IsError}"/>
<Grid Grid.Row="1" Width="480" HorizontalAlignment="Right" VerticalAlignment="Top"> <TextBlock Grid.Column="1" Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.Launcher.Info}" IsVisible="{Binding !IsError}"/>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"> <Button Grid.Column="2" Classes="icon_button" Width="16" Height="16" Click="OnDismissNotification">
<ItemsControl ItemsSource="{Binding Notifications}"> <Path Width="10" Height="10" Data="{StaticResource Icons.Window.Close}"/>
<ItemsControl.ItemTemplate> </Button>
<DataTemplate DataType="m:Notification"> </Grid>
<Border Margin="10,6" HorizontalAlignment="Stretch" VerticalAlignment="Top" Effect="drop-shadow(0 0 12 #A0000000)">
<Border Padding="8" CornerRadius="6" Background="{DynamicResource Brush.Popup}">
<Grid RowDefinitions="26,Auto,32">
<StackPanel Grid.Row="0" Margin="8,0,0,0" Orientation="Horizontal" IsVisible="{Binding IsError}">
<Path Width="14" Height="14" Data="{StaticResource Icons.Error}" Fill="Red"/>
<TextBlock Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.Launcher.Error}"/>
</StackPanel>
<StackPanel Grid.Row="0" Margin="8,0,0,0" Orientation="Horizontal" IsVisible="{Binding !IsError}">
<Path Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="Green"/>
<TextBlock Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.Launcher.Info}"/>
</StackPanel>
<TextBox Grid.Row="1" <ScrollViewer Grid.Row="1" Margin="8" MaxHeight="100" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
Classes="no_background no_border" <SelectableTextBlock TextWrapping="Wrap" Text="{Binding Message}"/>
IsReadOnly="True" </ScrollViewer>
TextWrapping="Wrap" </Grid>
ScrollViewer.VerticalScrollBarVisibility="Auto" </Border>
MaxHeight="100"
Margin="8" Padding="0"
VerticalContentAlignment="Top"
Text="{Binding Message}"/>
<StackPanel Grid.Row="2" Margin="0,4,0,0" Orientation="Horizontal" HorizontalAlignment="Right">
<Button Classes="flat"
Margin="0,0,8,0"
Command="{Binding CopyMessage}"
Content="{DynamicResource Text.CopyMessage}"
IsVisible="{Binding IsError}"/>
<Button Classes="flat primary"
Margin="0,0"
Content="{DynamicResource Text.Close}"
Click="OnDismissNotification"/>
</StackPanel>
</Grid>
</Border> </Border>
</Border> </DataTemplate>
</DataTemplate> </ItemsControl.ItemTemplate>
</ItemsControl.ItemTemplate> </ItemsControl>
</ItemsControl> </ScrollViewer>
</ScrollViewer> </Grid>
</Grid> </Grid>
</Grid> </Grid>
</UserControl> </UserControl>

2
src/Views/LauncherPage.axaml.cs
View file

@ -27,7 +27,7 @@ namespace SourceGit.Views
e.Handled = true; e.Handled = true;
} }
private void OnPopupCancelByClickMask(object sender, PointerPressedEventArgs e) private void OnMaskClicked(object sender, PointerPressedEventArgs e)
{ {
OnPopupCancel(sender, e); OnPopupCancel(sender, e);
} }