fix.我又改了一下融合桌面的设置窗口。

This commit is contained in:
lincube
2026-04-11 00:35:27 +08:00
parent 2156922039
commit e8ba847328

View File

@@ -111,91 +111,96 @@
<ScrollViewer Grid.Column="1" <ScrollViewer Grid.Column="1"
VerticalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
HorizontalScrollBarVisibility="Disabled"> HorizontalScrollBarVisibility="Disabled">
<StackPanel Margin="24,16,20,16" <StackPanel Margin="16,8,12,8"
Spacing="0"> Spacing="0">
<!-- 有选中组件时的显示 --> <!-- 有选中组件时的显示 -->
<Panel IsVisible="{Binding SelectedComponent, Converter={x:Static converters:ObjectConverters.IsNotNull}}"> <Panel IsVisible="{Binding SelectedComponent, Converter={x:Static converters:ObjectConverters.IsNotNull}}">
<!-- 组件标题 - 在右侧内容区顶部 --> <!-- 组件展示面板 - 有独立背景色,与窗口背景形成层级分界 -->
<TextBlock FontSize="28" <Border Classes="surface-translucent-panel"
FontWeight="SemiBold" CornerRadius="{DynamicResource DesignCornerRadiusLg}"
Foreground="{DynamicResource AdaptiveTextPrimaryBrush}" Padding="20">
Text="{Binding SelectedComponent.DisplayName}" <StackPanel Spacing="16">
Margin="0,0,0,16"/> <!-- 组件标题 -->
<TextBlock FontSize="28"
FontWeight="SemiBold"
Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
Text="{Binding SelectedComponent.DisplayName}"/>
<!-- 固定大小的预览卡片 - 与窗口背景有色差 --> <!-- 固定大小的预览卡片 -->
<Border CornerRadius="{DynamicResource DesignCornerRadiusSm}" <Border CornerRadius="{DynamicResource DesignCornerRadiusSm}"
Background="{DynamicResource AdaptiveSurfaceRaisedBrush}" Background="{DynamicResource AdaptiveSurfaceBaseBrush}"
BorderBrush="{DynamicResource AdaptiveGlassPanelBorderBrush}" BorderBrush="{DynamicResource AdaptiveGlassPanelBorderBrush}"
BorderThickness="1" BorderThickness="1"
Width="420" Width="420"
Height="320" Height="300"
HorizontalAlignment="Center"> HorizontalAlignment="Center">
<Grid Margin="16"> <Grid Margin="16">
<!-- 预览图片 --> <!-- 预览图片 -->
<Image Source="{Binding SelectedComponent.PreviewBitmap}" <Image Source="{Binding SelectedComponent.PreviewBitmap}"
Stretch="Uniform" Stretch="Uniform"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
RenderOptions.BitmapInterpolationMode="HighQuality" RenderOptions.BitmapInterpolationMode="HighQuality"
IsVisible="{Binding SelectedComponent.IsPreviewReady}"/> IsVisible="{Binding SelectedComponent.IsPreviewReady}"/>
<!-- 加载中状态 --> <!-- 加载中状态 -->
<Border IsVisible="{Binding SelectedComponent.IsPreviewPending}" <Border IsVisible="{Binding SelectedComponent.IsPreviewPending}"
Background="{DynamicResource AdaptiveSurfaceBaseBrush}"> Background="{DynamicResource AdaptiveSurfaceBaseBrush}">
<StackPanel HorizontalAlignment="Center" <StackPanel HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Spacing="12"> Spacing="12">
<ProgressBar Width="120" <ProgressBar Width="120"
IsIndeterminate="True"/> IsIndeterminate="True"/>
<TextBlock HorizontalAlignment="Center" <TextBlock HorizontalAlignment="Center"
TextAlignment="Center" TextAlignment="Center"
FontSize="14" FontSize="14"
Foreground="{DynamicResource AdaptiveTextSecondaryBrush}" Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
Text="{Binding SelectedComponent.PreviewStatusText}"/> Text="{Binding SelectedComponent.PreviewStatusText}"/>
</StackPanel> </StackPanel>
</Border>
<!-- 失败状态 -->
<Border IsVisible="{Binding SelectedComponent.IsPreviewFailed}"
Background="{DynamicResource AdaptiveSurfaceBaseBrush}">
<StackPanel HorizontalAlignment="Center"
VerticalAlignment="Center"
Spacing="8">
<fi:FluentIcon Icon="ImageOff"
IconVariant="Regular"
FontSize="48"
Opacity="0.5"
Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"/>
<TextBlock HorizontalAlignment="Center"
TextAlignment="Center"
FontWeight="SemiBold"
Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
Text="{Binding SelectedComponent.PreviewStatusText}"/>
<TextBlock HorizontalAlignment="Center"
TextAlignment="Center"
FontSize="12"
TextWrapping="Wrap"
Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
Text="{Binding SelectedComponent.PreviewErrorMessage}"/>
</StackPanel>
</Border>
</Grid>
</Border> </Border>
<!-- 失败状态 --> <!-- "添加小组件"按钮 - 在面板内居中,使用主题强调色 -->
<Border IsVisible="{Binding SelectedComponent.IsPreviewFailed}" <Button HorizontalAlignment="Center"
Background="{DynamicResource AdaptiveSurfaceBaseBrush}"> Classes="accent"
<StackPanel HorizontalAlignment="Center" Padding="24,10"
VerticalAlignment="Center" Tag="{Binding SelectedComponent.ComponentId}"
Spacing="8"> Click="OnAddComponentClick">
<fi:FluentIcon Icon="ImageOff" <StackPanel Orientation="Horizontal" Spacing="8">
IconVariant="Regular" <fi:FluentIcon Icon="Add" IconVariant="Regular" FontSize="16"/>
FontSize="48" <TextBlock Text="添加小组件" FontWeight="SemiBold"/>
Opacity="0.5"
Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"/>
<TextBlock HorizontalAlignment="Center"
TextAlignment="Center"
FontWeight="SemiBold"
Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
Text="{Binding SelectedComponent.PreviewStatusText}"/>
<TextBlock HorizontalAlignment="Center"
TextAlignment="Center"
FontSize="12"
TextWrapping="Wrap"
Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
Text="{Binding SelectedComponent.PreviewErrorMessage}"/>
</StackPanel> </StackPanel>
</Border> </Button>
</Grid>
</Border>
<!-- "添加小组件"按钮 - 在预览卡片正下方居中,使用主题强调色 -->
<Button HorizontalAlignment="Center"
Classes="accent"
Padding="24,10"
Margin="0,16,0,0"
Tag="{Binding SelectedComponent.ComponentId}"
Click="OnAddComponentClick">
<StackPanel Orientation="Horizontal" Spacing="8">
<fi:FluentIcon Icon="Add" IconVariant="Regular" FontSize="16"/>
<TextBlock Text="添加小组件" FontWeight="SemiBold"/>
</StackPanel> </StackPanel>
</Button> </Border>
</Panel> </Panel>
<!-- 空状态 --> <!-- 空状态 -->