Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

Merge branch 'main' of https://github.com/KnifeLemon/Filee into feat/524-keyboard-chips

cre8ive-marketing85d90373de36
diff --cc src/Filee.App/Views/Pages/ToolbarPage.axaml
index b06fa708,268eba08..319e30ac
--- a/src/Filee.App/Views/Pages/ToolbarPage.axaml
+++ b/src/Filee.App/Views/Pages/ToolbarPage.axaml
@@@ -417,38 -399,51 +404,52 @@@
<ItemsPanelTemplate>
<WrapPanel />
</ItemsPanelTemplate>
- </ItemsControl.ItemsPanel>
- <ItemsControl.ItemTemplate>
- <DataTemplate x:DataType="vm:PaletteChip">
- <Border Classes="chip" Classes.dimmed="{Binding IsDimmed}" ToolTip.Tip="{Binding Reason}"
- PointerPressed="OnChipPressed" DoubleTapped="OnChipDoubleTapped"
- Focusable="True" KeyDown="OnChipKeyDown"
- AutomationProperties.Name="{Binding Label}">
- <!-- A chip wider than the palette ends its caption with "…" instead of being cut at the edge. -->
- <DockPanel>
- <TextBlock Text="{Binding Label}" FontWeight="SemiBold" TextTrimming="CharacterEllipsis" />
- <TextBlock Classes="caption" Text="{Binding Caption}" VerticalAlignment="Center" Margin="6,0,0,0"
- TextTrimming="CharacterEllipsis" />
- </DockPanel>
- </Border>
+ </ListBox.ItemsPanel>
+ <ListBox.ItemTemplate>
+ <DataTemplate x:DataType="vm:PaletteTabItem">
+ <TextBlock Text="{Binding Label}" TextWrapping="Wrap" />
</DataTemplate>
- </ItemsControl.ItemTemplate>
- </ItemsControl>
- </Border>
- <StackPanel Spacing="4" Margin="2,6,0,0">
- <TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource toolbar.hint_add}" />
- <TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource toolbar.hint_remove}" />
- <TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource toolbar.hint_reorder}" />
- <TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource toolbar.hint_edit}" />
+ </ListBox.ItemTemplate>
+ </ListBox>
+ <Border x:Name="PaletteBox" MinHeight="180" Padding="6" CornerRadius="{DynamicResource SoftRadius}"
+ BorderThickness="2" BorderBrush="{DynamicResource SubtleBorderBrush}" Background="Transparent">
+ <ItemsControl ItemsSource="{Binding VisiblePalette}">
+ <ItemsControl.ItemsPanel>
+ <ItemsPanelTemplate>
+ <WrapPanel />
+ </ItemsPanelTemplate>
+ </ItemsControl.ItemsPanel>
+ <ItemsControl.ItemTemplate>
+ <DataTemplate x:DataType="vm:PaletteChip">
+ <Border Classes="chip" Classes.dimmed="{Binding IsDimmed}" ToolTip.Tip="{Binding Reason}"
- PointerPressed="OnChipPressed" DoubleTapped="OnChipDoubleTapped">
++ PointerPressed="OnChipPressed" DoubleTapped="OnChipDoubleTapped"
++ Focusable="True" KeyDown="OnChipKeyDown" AutomationProperties.Name="{Binding Label}">
+ <!-- A chip wider than the palette ends its caption with "…" instead of being cut at the edge. -->
+ <DockPanel>
+ <TextBlock Text="{Binding Label}" FontWeight="SemiBold" TextTrimming="CharacterEllipsis" />
+ <TextBlock Classes="caption" Text="{Binding Caption}" VerticalAlignment="Center" Margin="6,0,0,0"
+ TextTrimming="CharacterEllipsis" />
+ </DockPanel>
+ </Border>
+ </DataTemplate>
+ </ItemsControl.ItemTemplate>
+ </ItemsControl>
+ </Border>
+ <StackPanel Spacing="4" Margin="2,6,0,0">
+ <TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource toolbar.hint_add}" />
+ <TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource toolbar.hint_remove}" />
+ <TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource toolbar.hint_reorder}" />
+ <TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource toolbar.hint_edit}" />
+ </StackPanel>
</StackPanel>
- </StackPanel>
- </Grid>
+ </Grid>
- <!-- Drag ghost layer -->
- <Canvas x:Name="DragLayer" Grid.RowSpan="2" IsHitTestVisible="False">
- <Border x:Name="Ghost" IsVisible="False">
- <TextBlock x:Name="GhostText" Foreground="{DynamicResource OnAccentBrush}" FontWeight="SemiBold" />
- </Border>
- </Canvas>
- </Grid>
+ <!-- Drag ghost layer -->
+ <Canvas x:Name="DragLayer" Grid.RowSpan="2" IsHitTestVisible="False">
+ <Border x:Name="Ghost" IsVisible="False">
+ <TextBlock x:Name="GhostText" Foreground="{DynamicResource OnAccentBrush}" FontWeight="SemiBold" />
+ </Border>
+ </Canvas>
+ </Grid>
+ </ScrollViewer>
</UserControl>