Compare commits
3 commits
6c9bee7391
...
f47edfb2f6
| Author | SHA1 | Date | |
|---|---|---|---|
| f47edfb2f6 | |||
| 47914fcd77 | |||
| dba7dcc8a8 |
2 changed files with 28 additions and 17 deletions
|
|
@ -628,36 +628,43 @@
|
||||||
</DataGridTemplateColumn>
|
</DataGridTemplateColumn>
|
||||||
|
|
||||||
<!-- Col 5a — Per-row gear: opens the ISO override editor for this
|
<!-- Col 5a — Per-row gear: opens the ISO override editor for this
|
||||||
participant. Narrow (32px) so the table still fits inside a
|
participant. We use the Unicode gear glyph (U+2699) instead
|
||||||
1280px window after the toggle column. -->
|
of a custom Path — it renders cleanly at any size, doesn't
|
||||||
<DataGridTemplateColumn Header="" Width="32" IsReadOnly="True">
|
disappear against dark rows the way 1.4px strokes do, and
|
||||||
|
reads as "settings" at a glance. Header is "CFG" so the
|
||||||
|
affordance is discoverable even when the row hover state
|
||||||
|
isn't active. -->
|
||||||
|
<DataGridTemplateColumn Header="CFG" Width="56" IsReadOnly="True">
|
||||||
<DataGridTemplateColumn.CellTemplate>
|
<DataGridTemplateColumn.CellTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Button Style="{StaticResource Wd.Button.Ghost}"
|
<Button Style="{StaticResource Wd.Button.Ghost}"
|
||||||
Click="OnIsoOverrideClick"
|
Click="OnIsoOverrideClick"
|
||||||
Padding="6,4"
|
Padding="6,2"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
ToolTip="Override output settings for this participant">
|
ToolTip="Override output settings for this participant (framerate, resolution, audio)">
|
||||||
<Path Data="M 8,1 L 8,3 M 8,13 L 8,15 M 1,8 L 3,8 M 13,8 L 15,8 M 3,3 L 4.5,4.5 M 11.5,11.5 L 13,13 M 3,13 L 4.5,11.5 M 11.5,4.5 L 13,3 M 8,5.5 C 9.4,5.5 10.5,6.6 10.5,8 C 10.5,9.4 9.4,10.5 8,10.5 C 6.6,10.5 5.5,9.4 5.5,8 C 5.5,6.6 6.6,5.5 8,5.5"
|
<TextBlock Text="⚙"
|
||||||
Stroke="{DynamicResource Wd.Text.Secondary}"
|
FontSize="16"
|
||||||
StrokeThickness="1.4"
|
FontFamily="Segoe UI Symbol"
|
||||||
Fill="Transparent"
|
Foreground="{DynamicResource Wd.Text.Primary}"
|
||||||
Width="14" Height="14"
|
VerticalAlignment="Center"
|
||||||
Stretch="None"/>
|
HorizontalAlignment="Center"/>
|
||||||
</Button>
|
</Button>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</DataGridTemplateColumn.CellTemplate>
|
</DataGridTemplateColumn.CellTemplate>
|
||||||
</DataGridTemplateColumn>
|
</DataGridTemplateColumn>
|
||||||
|
|
||||||
<!-- Col 5 — ISO toggle pill. LIVE = cyan-muted fill + cyan border + cyan text.
|
<!-- Col 5 — ISO toggle. LIVE = cyan-muted fill + cyan border + cyan text.
|
||||||
OFF = hollow neutral. Error states use the existing IsoToggle style. -->
|
OFF = hollow neutral. Error states use the existing IsoToggle style.
|
||||||
<DataGridTemplateColumn Header="ISO" Width="100">
|
Width 124 (was 100/110) so the "Enable" / "● LIVE" content has
|
||||||
|
breathing room inside the rounded-rect — 100 was clipping the label
|
||||||
|
at the right edge once the IsoToggle stopped being a full pill. -->
|
||||||
|
<DataGridTemplateColumn Header="ISO" Width="124">
|
||||||
<DataGridTemplateColumn.CellTemplate>
|
<DataGridTemplateColumn.CellTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Button Command="{Binding ToggleIsoCommand}"
|
<Button Command="{Binding ToggleIsoCommand}"
|
||||||
Margin="0,0,12,0"
|
Margin="0,0,12,0"
|
||||||
Padding="14,6"
|
Padding="10,6"
|
||||||
VerticalAlignment="Center">
|
VerticalAlignment="Center">
|
||||||
<Button.Style>
|
<Button.Style>
|
||||||
<Style TargetType="Button" BasedOn="{StaticResource Wd.Button.IsoToggle}">
|
<Style TargetType="Button" BasedOn="{StaticResource Wd.Button.IsoToggle}">
|
||||||
|
|
|
||||||
|
|
@ -319,7 +319,11 @@
|
||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<!-- ISO toggle: pill, status-coded -->
|
<!-- ISO toggle: rounded-rect (Radius.M) to match the rest of the button
|
||||||
|
family, status-coded background (LIVE cyan / ERROR coral / NO SIGNAL
|
||||||
|
amber). Previously a full pill (CornerRadius=999); pill made the LIVE
|
||||||
|
indicator visually distinct from the toolbar buttons in a way that
|
||||||
|
read as "different control type" rather than "different state". -->
|
||||||
<Style x:Key="Wd.Button.IsoToggle" TargetType="Button">
|
<Style x:Key="Wd.Button.IsoToggle" TargetType="Button">
|
||||||
<Setter Property="FontFamily" Value="{StaticResource Wd.Font.Sans}"/>
|
<Setter Property="FontFamily" Value="{StaticResource Wd.Font.Sans}"/>
|
||||||
<Setter Property="FontSize" Value="11"/>
|
<Setter Property="FontSize" Value="11"/>
|
||||||
|
|
@ -340,7 +344,7 @@
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
CornerRadius="999">
|
CornerRadius="{StaticResource Radius.M}">
|
||||||
<ContentPresenter HorizontalAlignment="Center"
|
<ContentPresenter HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Margin="{TemplateBinding Padding}"/>
|
Margin="{TemplateBinding Padding}"/>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue