UI 更新

This commit is contained in:
GukSang.Jin
2026-04-03 10:46:38 +08:00
parent fc79a49458
commit 5abb90f3ae
3 changed files with 850 additions and 442 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -26,6 +26,29 @@ public partial class MainWindow : Window
_engineeringTouchHoldTimer.Tick += EngineeringTouchHoldTimer_OnTick;
}
private void InspectionItemsGrid_OnPreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
if (FindVisualParent<DataGridRow>(e.OriginalSource as DependencyObject) is null
&& FindVisualParent<DataGridCell>(e.OriginalSource as DependencyObject) is null)
{
return;
}
Dispatcher.BeginInvoke(() =>
{
if (sender is DataGrid { SelectedItem: not null })
{
ProjectDetailTab.IsSelected = true;
}
}, DispatcherPriority.Background);
}
private void ReturnToProjectListButton_OnClick(object sender, RoutedEventArgs e)
{
ProjectListTab.IsSelected = true;
InspectionItemsGrid.Focus();
}
private void ConfigureTrendBindings()
{
var converter = (IMultiValueConverter)Resources["TrendPointCollectionConverter"];
@@ -158,4 +181,19 @@ public partial class MainWindow : Window
&& position.X <= EngineeringHotspotWidth
&& position.Y <= EngineeringHotspotHeight;
}
private static T? FindVisualParent<T>(DependencyObject? child) where T : DependencyObject
{
while (child is not null)
{
if (child is T parent)
{
return parent;
}
child = VisualTreeHelper.GetParent(child);
}
return null;
}
}

View File

@@ -37,7 +37,7 @@
<Setter Property="Background" Value="{StaticResource PanelBg}" />
<Setter Property="BorderBrush" Value="{StaticResource CardBorder}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="CornerRadius" Value="18" />
<Setter Property="CornerRadius" Value="10" />
<Setter Property="Padding" Value="18" />
<Setter Property="Margin" Value="0,0,0,12" />
</Style>
@@ -51,7 +51,7 @@
<Setter Property="Background" Value="{StaticResource FieldSurfaceBrush}" />
<Setter Property="BorderBrush" Value="{StaticResource FieldAccentBrush}" />
<Setter Property="Padding" Value="12" />
<Setter Property="CornerRadius" Value="16" />
<Setter Property="CornerRadius" Value="8" />
<Setter Property="Margin" Value="0,0,0,10" />
</Style>
@@ -80,7 +80,8 @@
<Setter Property="Background" Value="{StaticResource AccentBrush}" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Padding" Value="16,10" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderBrush" Value="#FF0E5E5A" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="15" />
@@ -90,15 +91,19 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Border x:Name="Bd" Background="{TemplateBinding Background}" CornerRadius="14">
<Border x:Name="Bd"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="6">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Margin="2" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Bd" Property="Opacity" Value="0.92" />
<Setter TargetName="Bd" Property="Background" Value="#FF0B8883" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter TargetName="Bd" Property="Opacity" Value="0.82" />
<Setter TargetName="Bd" Property="Opacity" Value="0.9" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="Bd" Property="Opacity" Value="0.5" />
@@ -176,20 +181,36 @@
<Style TargetType="TabItem">
<Setter Property="Margin" Value="0,0,10,0" />
<Setter Property="Padding" Value="16,10" />
<Setter Property="Padding" Value="18,10" />
<Setter Property="Foreground" Value="{StaticResource MutedTextBrush}" />
<Setter Property="FontSize" Value="15" />
<Setter Property="FontWeight" Value="SemiBold" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="TabItem">
<Border x:Name="Bd" Background="#FFE7EEF1" CornerRadius="14,14,0,0" Padding="{TemplateBinding Padding}" BorderBrush="Transparent" BorderThickness="0,0,0,3">
<ContentPresenter ContentSource="Header" HorizontalAlignment="Center" VerticalAlignment="Center" />
<Border x:Name="Bd"
Background="#FFE1E9EC"
CornerRadius="8,8,0,0"
Padding="{TemplateBinding Padding}"
BorderBrush="#FFD1DDE1"
BorderThickness="1,1,1,0">
<DockPanel LastChildFill="False">
<Border x:Name="Indicator"
DockPanel.Dock="Left"
Width="6"
Height="18"
Margin="0,0,8,0"
VerticalAlignment="Center"
Background="Transparent"
CornerRadius="2" />
<ContentPresenter ContentSource="Header" HorizontalAlignment="Center" VerticalAlignment="Center" />
</DockPanel>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter TargetName="Bd" Property="Background" Value="{StaticResource PanelBg}" />
<Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource AccentBrush}" />
<Setter TargetName="Bd" Property="BorderBrush" Value="#FFB8CCD2" />
<Setter TargetName="Indicator" Property="Background" Value="{StaticResource AccentBrush}" />
<Setter Property="Foreground" Value="{StaticResource HeaderBrush}" />
</Trigger>
</ControlTemplate.Triggers>
@@ -241,7 +262,7 @@
<Setter Property="Background" Value="#FFEAF4F6" />
</Trigger>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#FFDDEFEA" />
<Setter Property="Background" Value="#FFD7ECE7" />
<Setter Property="Foreground" Value="{StaticResource HeaderBrush}" />
</Trigger>
</Style.Triggers>