gramps/LlamaCasty
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(text): group controls and filter font families

Browse Source 
Put size and color on one row, place emphasis labels before their toggles, and split the remaining font families into handwriting, symbols, and international groups while omitting legacy dingbat fonts. Text-layer properties follow the existing hierarchical layout and palette conventions.
This commit is contained in:
gramps
2026-11-04 17:17:57 -08:00
parent 5f7bcc2425
commit d195c29f79
3 changed files with 115 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controls/LeftPanel.xaml
+42 -25
View File
@@ -326,7 +326,7 @@
VerticalScrollBarVisibility="Auto" MinHeight="72" MaxHeight="120" Margin="10,0,0,8"
AutomationProperties.Name="Text layer content"/>
<TextBlock Text="Typography" Style="{StaticResource PropertyHeader}"/>
<StackPanel Margin="10,0,0,6">
<StackPanel x:Name="TextTypographyOptions" Margin="10,0,0,6">
<TextBlock Text="Font Type" Style="{StaticResource PropertyFieldLabel}" Margin="0,0,0,3"/>
<ComboBox x:Name="TextLayerFontTypePicker"
ItemsSource="{Binding TextFontTypeOptions}"
@@ -338,35 +338,52 @@
SelectedItem="{Binding SelectedTextFontFamily, Mode=TwoWay}"
Style="{StaticResource YtComboBox}" Height="30" Margin="0,0,0,6"
AutomationProperties.Name="Text layer font"/>
<TextBlock Text="Size" Style="{StaticResource PropertyFieldLabel}" Margin="0,0,0,3"/>
<ComboBox x:Name="TextLayerSizePicker"
ItemsSource="{Binding TextFontSizeOptions}"
SelectedItem="{Binding SelectedElement.TextFontSize, Mode=TwoWay}"
Style="{StaticResource YtComboBox}" Height="30" Width="92"
HorizontalAlignment="Left" AutomationProperties.Name="Text layer size"/>
</StackPanel>
<TextBlock Text="Color" Style="{StaticResource PropertyHeader}"/>
<DockPanel Margin="10,0,0,6" LastChildFill="False">
<TextBox x:Name="TextLayerColorEditor"
<DockPanel Margin="0,0,0,0" LastChildFill="False">
<TextBlock DockPanel.Dock="Left" Text="Size" Style="{StaticResource PropertyFieldLabel}"
Width="30" VerticalAlignment="Center"/>
<ComboBox x:Name="TextLayerSizePicker" DockPanel.Dock="Left"
ItemsSource="{Binding TextFontSizeOptions}"
SelectedItem="{Binding SelectedElement.TextFontSize, Mode=TwoWay}"
Style="{StaticResource YtComboBox}" Height="30" Width="62"
AutomationProperties.Name="Text layer size"/>
<TextBlock DockPanel.Dock="Left" Text="Color" Style="{StaticResource PropertyFieldLabel}"
Width="34" Margin="6,0,0,0" VerticalAlignment="Center"/>
<TextBox x:Name="TextLayerColorEditor" DockPanel.Dock="Left"
Text="{Binding SelectedElement.TextColor, Mode=TwoWay, UpdateSourceTrigger=LostFocus}"
Style="{StaticResource YtTextBoxCompact}" MaxLength="9" Width="82"
ToolTip="#RRGGBB or #AARRGGBB" AutomationProperties.Name="Text layer color"/>
<ComboBox x:Name="TextLayerColorPicker"
Style="{StaticResource YtTextBoxCompact}" MaxLength="9" Width="68"
ToolTip="#RRGGBB or #AARRGGBB" AutomationProperties.Name="Text layer color"/>
<ComboBox x:Name="TextLayerColorPicker" DockPanel.Dock="Left"
ItemsSource="{Binding SelectedElement.TextColorOptions}"
SelectedItem="{Binding SelectedElement.TextColorEntry, Mode=TwoWay}"
ItemTemplateSelector="{StaticResource BorderColorTemplates}"
Style="{StaticResource YtComboBox}" MinWidth="112" Margin="8,0,0,0"
ToolTip="Choose a text color" AutomationProperties.Name="Text layer color palette"/>
</DockPanel>
Style="{StaticResource YtComboBox}" Width="100" Margin="4,0,0,0"
ToolTip="Choose a text color" AutomationProperties.Name="Text layer color palette"/>
</DockPanel>
</StackPanel>
<TextBlock Text="Emphasis" Style="{StaticResource PropertyHeader}"/>
<WrapPanel Margin="10,0,0,4">
<CheckBox Style="{StaticResource PropertyPillCheck}" Content="Bold" Margin="0,0,8,4"
IsChecked="{Binding SelectedElement.TextBold, Mode=TwoWay}"/>
<CheckBox Style="{StaticResource PropertyPillCheck}" Content="Italic" Margin="0,0,8,4"
IsChecked="{Binding SelectedElement.TextItalic, Mode=TwoWay}"/>
<CheckBox Style="{StaticResource PropertyPillCheck}" Content="Underline" Margin="0,0,8,4"
IsChecked="{Binding SelectedElement.TextUnderline, Mode=TwoWay}"/>
</WrapPanel>
<StackPanel x:Name="TextEmphasisOptions" Margin="10,0,0,4">
<DockPanel Margin="0,0,0,4" LastChildFill="False">
<TextBlock DockPanel.Dock="Left" Text="Bold" Style="{StaticResource PropertyFieldLabel}"
Width="72" VerticalAlignment="Center"/>
<ToggleButton x:Name="TextBoldToggle" Style="{StaticResource PillToggle}"
IsChecked="{Binding SelectedElement.TextBold, Mode=TwoWay}"
ToolTip="Bold text" HorizontalAlignment="Left"/>
</DockPanel>
<DockPanel Margin="0,0,0,4" LastChildFill="False">
<TextBlock DockPanel.Dock="Left" Text="Italic" Style="{StaticResource PropertyFieldLabel}"
Width="72" VerticalAlignment="Center"/>
<ToggleButton x:Name="TextItalicToggle" Style="{StaticResource PillToggle}"
IsChecked="{Binding SelectedElement.TextItalic, Mode=TwoWay}"
ToolTip="Italic text" HorizontalAlignment="Left"/>
</DockPanel>
<DockPanel LastChildFill="False">
<TextBlock DockPanel.Dock="Left" Text="Underline" Style="{StaticResource PropertyFieldLabel}"
Width="72" VerticalAlignment="Center"/>
<ToggleButton x:Name="TextUnderlineToggle" Style="{StaticResource PillToggle}"
IsChecked="{Binding SelectedElement.TextUnderline, Mode=TwoWay}"
ToolTip="Underline text" HorizontalAlignment="Left"/>
</DockPanel>
</StackPanel>
<TextBlock Text="Alignment" Style="{StaticResource PropertyHeader}"/>
<DockPanel Margin="10,0,0,4">
<TextBlock DockPanel.Dock="Left" Text="Horizontal" Style="{StaticResource PropertyFieldLabel}"