mirror of
https://github.com/wwiinnddyy/LanMountainDesktop.git
synced 2026-06-22 00:54:26 +08:00
Compare commits
9 Commits
v0.8.3.2
...
692ca3de3d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
692ca3de3d | ||
|
|
d62226ffa0 | ||
|
|
91ab52ce8b | ||
|
|
4a89c2388b | ||
|
|
cb96180118 | ||
|
|
cf4b8e2132 | ||
|
|
e8ba847328 | ||
|
|
2156922039 | ||
|
|
e795e9964e |
91
.github/workflows/release.yml
vendored
91
.github/workflows/release.yml
vendored
@@ -66,8 +66,19 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
arch: [x64, x86]
|
include:
|
||||||
name: Build_Windows_${{ matrix.arch }}
|
# 完整版(自包含 .NET 运行时)
|
||||||
|
- arch: x64
|
||||||
|
self_contained: true
|
||||||
|
suffix: ''
|
||||||
|
- arch: x86
|
||||||
|
self_contained: true
|
||||||
|
suffix: ''
|
||||||
|
# 轻盈版(框架依赖,仅 x64)
|
||||||
|
- arch: x64
|
||||||
|
self_contained: false
|
||||||
|
suffix: '-lite'
|
||||||
|
name: Build_Windows_${{ matrix.arch }}${{ matrix.suffix }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
@@ -95,21 +106,42 @@ jobs:
|
|||||||
|
|
||||||
- name: Publish
|
- name: Publish
|
||||||
run: |
|
run: |
|
||||||
dotnet publish LanMountainDesktop/LanMountainDesktop.csproj `
|
$selfContained = "${{ matrix.self_contained }}" -eq "true"
|
||||||
-c Release `
|
$publishDir = if ($selfContained) { "publish/windows-${{ matrix.arch }}" } else { "publish/windows-${{ matrix.arch }}-lite" }
|
||||||
-o ./publish/windows-${{ matrix.arch }} `
|
|
||||||
--self-contained `
|
if ($selfContained) {
|
||||||
-r win-${{ matrix.arch }} `
|
dotnet publish LanMountainDesktop/LanMountainDesktop.csproj `
|
||||||
-p:PublishSingleFile=false `
|
-c Release `
|
||||||
-p:SelfContained=true `
|
-o ./$publishDir `
|
||||||
-p:DebugType=none `
|
--self-contained `
|
||||||
-p:DebugSymbols=false `
|
-r win-${{ matrix.arch }} `
|
||||||
-p:PublishTrimmed=false `
|
-p:PublishSingleFile=false `
|
||||||
-p:PublishReadyToRun=false `
|
-p:DebugType=none `
|
||||||
-p:Version=${{ needs.prepare.outputs.version }} `
|
-p:DebugSymbols=false `
|
||||||
-p:AssemblyVersion=${{ needs.prepare.outputs.assembly_version }} `
|
-p:PublishTrimmed=false `
|
||||||
-p:FileVersion=${{ needs.prepare.outputs.assembly_version }} `
|
-p:PublishReadyToRun=false `
|
||||||
-p:InformationalVersion=${{ needs.prepare.outputs.informational_version }}
|
-p:Version=${{ needs.prepare.outputs.version }} `
|
||||||
|
-p:AssemblyVersion=${{ needs.prepare.outputs.assembly_version }} `
|
||||||
|
-p:FileVersion=${{ needs.prepare.outputs.assembly_version }} `
|
||||||
|
-p:InformationalVersion=${{ needs.prepare.outputs.informational_version }}
|
||||||
|
} else {
|
||||||
|
dotnet publish LanMountainDesktop/LanMountainDesktop.csproj `
|
||||||
|
-c Release `
|
||||||
|
-o ./$publishDir `
|
||||||
|
--self-contained:false `
|
||||||
|
-p:PublishSingleFile=false `
|
||||||
|
-p:DebugType=none `
|
||||||
|
-p:DebugSymbols=false `
|
||||||
|
-p:PublishTrimmed=false `
|
||||||
|
-p:PublishReadyToRun=false `
|
||||||
|
-p:Version=${{ needs.prepare.outputs.version }} `
|
||||||
|
-p:AssemblyVersion=${{ needs.prepare.outputs.assembly_version }} `
|
||||||
|
-p:FileVersion=${{ needs.prepare.outputs.assembly_version }} `
|
||||||
|
-p:InformationalVersion=${{ needs.prepare.outputs.informational_version }}
|
||||||
|
}
|
||||||
|
|
||||||
|
Write-Host "Published to: $publishDir"
|
||||||
|
Write-Host "Self-contained: $selfContained"
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
|
|
||||||
- name: Install Inno Setup
|
- name: Install Inno Setup
|
||||||
@@ -120,7 +152,9 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
$version = "${{ needs.prepare.outputs.version }}"
|
$version = "${{ needs.prepare.outputs.version }}"
|
||||||
$arch = "${{ matrix.arch }}"
|
$arch = "${{ matrix.arch }}"
|
||||||
$publishDir = "publish\windows-$arch"
|
$selfContained = "${{ matrix.self_contained }}" -eq "true"
|
||||||
|
$suffix = "${{ matrix.suffix }}"
|
||||||
|
$publishDir = if ($selfContained) { "publish\windows-$arch" } else { "publish\windows-$arch-lite" }
|
||||||
$installerScript = "LanMountainDesktop\installer\LanMountainDesktop.iss"
|
$installerScript = "LanMountainDesktop\installer\LanMountainDesktop.iss"
|
||||||
$outputDir = "build-installer"
|
$outputDir = "build-installer"
|
||||||
|
|
||||||
@@ -187,6 +221,8 @@ jobs:
|
|||||||
"/DPublishDir=$publishDir",
|
"/DPublishDir=$publishDir",
|
||||||
"/DMyOutputDir=$outputDir",
|
"/DMyOutputDir=$outputDir",
|
||||||
"/DMyAppArch=$arch",
|
"/DMyAppArch=$arch",
|
||||||
|
"/DMyAppSuffix=$suffix",
|
||||||
|
"/DIsSelfContained=$selfContained",
|
||||||
$installerScript
|
$installerScript
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -213,7 +249,7 @@ jobs:
|
|||||||
- name: Upload Installer
|
- name: Upload Installer
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: release-windows-${{ matrix.arch }}
|
name: release-windows-${{ matrix.arch }}${{ matrix.suffix }}
|
||||||
path: build-installer/*.exe
|
path: build-installer/*.exe
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
retention-days: 30
|
retention-days: 30
|
||||||
@@ -548,19 +584,22 @@ jobs:
|
|||||||
artifacts: "release-files/**"
|
artifacts: "release-files/**"
|
||||||
body: |
|
body: |
|
||||||
## Release ${{ needs.prepare.outputs.version }}
|
## Release ${{ needs.prepare.outputs.version }}
|
||||||
|
|
||||||
### Windows
|
### Windows
|
||||||
- **LanMountainDesktop-Setup-{version}-x64.exe** - 64-bit installer
|
- **LanMountainDesktop-Setup-{version}-x64.exe** - 64-bit installer (完整版,包含 .NET 运行时)
|
||||||
- **LanMountainDesktop-Setup-{version}-x86.exe** - 32-bit installer
|
- **LanMountainDesktop-Setup-{version}-x64-lite.exe** - 64-bit installer (轻量版,需安装 .NET 10 Runtime)
|
||||||
|
- **LanMountainDesktop-Setup-{version}-x86.exe** - 32-bit installer (完整版,包含 .NET 运行时)
|
||||||
|
|
||||||
|
> **轻量版说明**:轻量版不包含 .NET 运行时,体积更小。首次运行前需安装 [.NET 10 Desktop Runtime](https://dotnet.microsoft.com/download/dotnet/10.0)。
|
||||||
|
|
||||||
Installation: Double-click the .exe file and follow the wizard.
|
Installation: Double-click the .exe file and follow the wizard.
|
||||||
|
|
||||||
### Linux
|
### Linux
|
||||||
- **LanMountainDesktop-{version}-linux-x64.deb** - Debian package (x64)
|
- **LanMountainDesktop-{version}-linux-x64.deb** - Debian package (x64)
|
||||||
|
|
||||||
### macOS
|
### macOS
|
||||||
- **LanMountainDesktop-{version}-macos-x64.dmg** - Intel processor
|
- **LanMountainDesktop-{version}-macos-x64.dmg** - Intel processor
|
||||||
- **LanMountainDesktop-{version}-macos-arm64.dmg** - Apple Silicon (M1/M2/M3)
|
- **LanMountainDesktop-{version}-macos-arm64.dmg** - Apple Silicon (M1/M2/M3)
|
||||||
|
|
||||||
See commits for changes.
|
See commits for changes.
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
112
.trae/skills/refactoring-insight/SKILL.md
Normal file
112
.trae/skills/refactoring-insight/SKILL.md
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
---
|
||||||
|
name: "refactoring-insight"
|
||||||
|
description: "Analyzes codebase for refactoring opportunities: large files, code duplication, god classes, naming inconsistencies, tight coupling, and missing abstractions. Invoke when user asks for refactoring insight/analysis or wants to improve code architecture."
|
||||||
|
---
|
||||||
|
|
||||||
|
# Refactoring Insight
|
||||||
|
|
||||||
|
Deep codebase analysis skill that identifies structural problems and produces prioritized refactoring recommendations.
|
||||||
|
|
||||||
|
## When to Invoke
|
||||||
|
|
||||||
|
- User asks for "refactoring insight", "refactoring analysis", "code quality analysis", "architecture review"
|
||||||
|
- User wants to understand what should be refactored in the codebase
|
||||||
|
- User asks "where are the code smells?" or "what needs refactoring?"
|
||||||
|
|
||||||
|
## Analysis Dimensions
|
||||||
|
|
||||||
|
Run all 6 dimensions in parallel where possible. For each dimension, use search agents to gather data, then synthesize findings.
|
||||||
|
|
||||||
|
### 1. Large Files / God Classes
|
||||||
|
|
||||||
|
- Find all .cs files over 300 lines, sorted by line count descending
|
||||||
|
- Identify partial classes and sum their total line count across files
|
||||||
|
- Flag classes with 15+ methods or constructors taking 8+ parameters
|
||||||
|
- Focus on: Views/, ViewModels/, Services/, plugins/
|
||||||
|
|
||||||
|
**Output**: Table of files with line counts and responsibility summary.
|
||||||
|
|
||||||
|
### 2. Code Duplication
|
||||||
|
|
||||||
|
Search for these specific duplication patterns:
|
||||||
|
|
||||||
|
- **Service boilerplate**: Repeated DI registration, `new` instantiation instead of DI
|
||||||
|
- **Data service pattern**: Services that fetch/parse/transform data similarly (Load → Map → Save)
|
||||||
|
- **Localization pattern**: `private readonly LocalizationService _localizationService = new();` and `L()` helper method repetitions
|
||||||
|
- **Helper method duplication**: Methods like `ResolveUnifiedMainRadiusValue`, `NormalizeConfig`, `ParticleState` classes copied across files
|
||||||
|
- **Error handling pattern**: Identical try-catch blocks repeated in multiple methods
|
||||||
|
- **Settings snapshot pattern**: `_settingsFacade.Settings.LoadSnapshot<T>(scope)` call sites
|
||||||
|
|
||||||
|
**Output**: List of duplicated patterns with file locations and line numbers.
|
||||||
|
|
||||||
|
### 3. Tight Coupling
|
||||||
|
|
||||||
|
- Services instantiated via `new` instead of DI injection
|
||||||
|
- ViewModels directly accessing infrastructure-layer APIs (e.g., `LoadSnapshot/SaveSnapshot`)
|
||||||
|
- Hard-coded dependencies (GitHub repo owner/name, default values)
|
||||||
|
- `Application.Current` upcasting to access services: `(Application.Current as App)?.SomeService`
|
||||||
|
- Platform-specific code embedded in cross-platform services without interface abstraction
|
||||||
|
|
||||||
|
**Output**: Table of coupling violations with severity (high/medium/low).
|
||||||
|
|
||||||
|
### 4. Naming Inconsistencies
|
||||||
|
|
||||||
|
- Service suffix inconsistency: `Service` vs `Store` vs `Helper` vs `Provider` vs `Manager` vs `Factory` for similar responsibilities
|
||||||
|
- Model suffix inconsistency: `Snapshot` vs `State` vs `Types` for similar concepts
|
||||||
|
- Platform prefix inconsistency: `Windows`/`Linux` full name vs `Mac` abbreviation
|
||||||
|
- Confusing names: services with similar names but different responsibilities (e.g., `NotificationService` vs `NotificationListenerService`)
|
||||||
|
|
||||||
|
**Output**: Categorized list of naming inconsistencies.
|
||||||
|
|
||||||
|
### 5. Missing Abstractions
|
||||||
|
|
||||||
|
- Services without corresponding interfaces (check for `I<ServiceName>` pattern)
|
||||||
|
- Common patterns that could be extracted into base classes:
|
||||||
|
- `SettingsPageViewModelBase` for shared ViewModel boilerplate
|
||||||
|
- `JsonFileSettingsService<TSnapshot>` for repeated settings persistence
|
||||||
|
- `SettingsDomainServiceBase<TState>` for Load-Map-Save pattern
|
||||||
|
- `DesktopComponentWidgetBase` for shared Widget code
|
||||||
|
- `ComponentEditorViewBase` enhancements (e.g., `_suppressEvents` pattern)
|
||||||
|
- Static singleton/Factory providers repeating thread-safe lazy-load boilerplate
|
||||||
|
|
||||||
|
**Output**: List of missing abstractions with proposed base class/interface names.
|
||||||
|
|
||||||
|
### 6. Misplaced Responsibilities
|
||||||
|
|
||||||
|
- Files in wrong directories (e.g., data access in Settings/, UI services mixed with data services)
|
||||||
|
- ViewModels containing business logic or file system operations
|
||||||
|
- Widget code-behind files with excessive logic (>200 lines)
|
||||||
|
- Platform-specific services not organized into subdirectories
|
||||||
|
|
||||||
|
**Output**: List of misplaced files/classes with recommended new locations.
|
||||||
|
|
||||||
|
## Output Format
|
||||||
|
|
||||||
|
Produce a structured report with:
|
||||||
|
|
||||||
|
1. **Summary table**: Total metrics (file count, duplication count, etc.)
|
||||||
|
2. **Priority-ranked findings**: P0 (must fix), P1 (should fix), P2 (recommended), P3 (nice to have)
|
||||||
|
3. **Each finding includes**: Problem description, affected files with links, specific line numbers, recommended action, estimated impact
|
||||||
|
|
||||||
|
### Priority Criteria
|
||||||
|
|
||||||
|
- **P0**: Files over 1000 lines with mixed responsibilities; patterns duplicated 10+ times; god classes with 20+ dependencies
|
||||||
|
- **P1**: Patterns duplicated 5-9 times; services without interfaces that are widely used; DI bypass affecting testability
|
||||||
|
- **P2**: Patterns duplicated 3-4 times; naming inconsistencies affecting readability; misplaced files
|
||||||
|
- **P3**: Minor naming variations; single-instance duplications; organizational improvements
|
||||||
|
|
||||||
|
## Project-Specific Context
|
||||||
|
|
||||||
|
This skill is aware of the LanMountainDesktop project structure:
|
||||||
|
|
||||||
|
- `LanMountainDesktop/Services/` — Business and infrastructure services
|
||||||
|
- `LanMountainDesktop/Services/Settings/` — Settings subsystem
|
||||||
|
- `LanMountainDesktop/ViewModels/` — View models
|
||||||
|
- `LanMountainDesktop/Views/Components/` — Desktop widget components
|
||||||
|
- `LanMountainDesktop/Views/ComponentEditors/` — Widget editor views
|
||||||
|
- `LanMountainDesktop/plugins/` — Plugin runtime
|
||||||
|
- `LanMountainDesktop.PluginSdk/` — Plugin SDK public API
|
||||||
|
- `LanMountainDesktop.Shared.Contracts/` — Host/plugin shared contracts
|
||||||
|
- `LanMountainDesktop.Appearance/` — Appearance and corner radius infrastructure
|
||||||
|
|
||||||
|
When analyzing, respect the project's architectural boundaries documented in `docs/ARCHITECTURE.md` and `docs/ECOSYSTEM_BOUNDARIES.md`.
|
||||||
166
.trae/specs/fused-desktop-library-redesign/spec.md
Normal file
166
.trae/specs/fused-desktop-library-redesign/spec.md
Normal file
@@ -0,0 +1,166 @@
|
|||||||
|
# 融合桌面组件库窗口重设计规格
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
当前融合桌面组件库窗口(FusedDesktopComponentLibraryWindow)的UI设计较为基础,与Windows 11小组件编辑面板相比,缺乏现代化的交互体验和视觉层次。用户需要一个更直观、更美观的界面来浏览和添加组件到系统桌面(负一屏)。
|
||||||
|
|
||||||
|
参考Windows 11小组件编辑面板的设计特点:
|
||||||
|
|
||||||
|
* 左侧分类列表,右侧选中组件的详细预览
|
||||||
|
|
||||||
|
* 大型组件预览区域,让用户清楚看到组件效果
|
||||||
|
|
||||||
|
* 底部明显的"添加"操作按钮
|
||||||
|
|
||||||
|
* 简洁的关闭按钮(X)在右上角
|
||||||
|
|
||||||
|
* 深色主题配合毛玻璃效果
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
* **重新设计窗口布局**:从左右分栏(分类列表+组件网格)改为左侧面板+右侧预览区的布局
|
||||||
|
|
||||||
|
* **添加组件详情预览区**:选中组件后右侧显示大尺寸预览和组件信息
|
||||||
|
|
||||||
|
* **优化关闭按钮**:使用标准的X图标按钮,不使用圆形样式
|
||||||
|
|
||||||
|
* **添加底部操作栏**:包含"添加到桌面"主操作按钮和"查找更多组件"链接
|
||||||
|
|
||||||
|
* **复用阑山桌面组件库分类**:使用相同的分类ID、图标和本地化文本
|
||||||
|
|
||||||
|
* **移除搜索功能**:参考Windows 11设计,暂不提供搜索
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
* 受影响文件:
|
||||||
|
|
||||||
|
* `LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml`
|
||||||
|
|
||||||
|
* `LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml.cs`
|
||||||
|
|
||||||
|
* `LanMountainDesktop/Views/FusedDesktopComponentLibraryControl.axaml`
|
||||||
|
|
||||||
|
* `LanMountainDesktop/Views/FusedDesktopComponentLibraryControl.axaml.cs`
|
||||||
|
|
||||||
|
* `LanMountainDesktop/ViewModels/ComponentLibraryWindowViewModel.cs`(可能需要添加新属性)
|
||||||
|
|
||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: 窗口布局重设计
|
||||||
|
|
||||||
|
系统应提供一个类似于Windows 11小组件编辑面板的组件库窗口。
|
||||||
|
|
||||||
|
#### Scenario: 窗口整体结构
|
||||||
|
|
||||||
|
* **GIVEN** 用户从托盘菜单打开融合桌面组件库
|
||||||
|
|
||||||
|
* **WHEN** 窗口显示时
|
||||||
|
|
||||||
|
* **THEN** 窗口应呈现:
|
||||||
|
|
||||||
|
* 顶部标题栏:左侧显示"添加小组件"标题,右侧有关闭按钮(X)
|
||||||
|
|
||||||
|
* 左侧面板:分类列表(复用阑山桌面组件库的分类和图标)
|
||||||
|
|
||||||
|
* 右侧主区域:选中组件的大尺寸预览 + 组件信息 + 添加按钮
|
||||||
|
|
||||||
|
* 底部:"查找更多组件"链接
|
||||||
|
|
||||||
|
#### Scenario: 分类列表交互
|
||||||
|
|
||||||
|
* **GIVEN** 左侧显示组件分类列表
|
||||||
|
|
||||||
|
* **WHEN** 用户点击某个分类
|
||||||
|
|
||||||
|
* **THEN** 右侧应显示该分类下的第一个组件的预览
|
||||||
|
|
||||||
|
* **AND** 分类项应有选中状态视觉反馈
|
||||||
|
|
||||||
|
* **AND** 分类图标和名称应与阑山桌面组件库保持一致
|
||||||
|
|
||||||
|
#### Scenario: 组件预览区
|
||||||
|
|
||||||
|
* **GIVEN** 用户选中一个组件
|
||||||
|
|
||||||
|
* **WHEN** 预览区显示时
|
||||||
|
|
||||||
|
* **THEN** 应显示:
|
||||||
|
|
||||||
|
* 组件标题(大字号)
|
||||||
|
|
||||||
|
* 大尺寸组件预览图(接近实际尺寸)
|
||||||
|
|
||||||
|
* 组件描述/功能说明
|
||||||
|
|
||||||
|
* 底部"添加到桌面"按钮
|
||||||
|
|
||||||
|
#### Scenario: 添加组件操作
|
||||||
|
|
||||||
|
* **GIVEN** 用户查看组件预览
|
||||||
|
|
||||||
|
* **WHEN** 用户点击"添加到桌面"按钮
|
||||||
|
|
||||||
|
* **THEN** 组件应被添加到系统桌面(负一屏)中央
|
||||||
|
|
||||||
|
* **AND** 窗口应关闭
|
||||||
|
|
||||||
|
#### Scenario: 关闭按钮样式
|
||||||
|
|
||||||
|
* **GIVEN** 窗口标题栏有关闭按钮
|
||||||
|
|
||||||
|
* **THEN** 关闭按钮应使用标准的X图标
|
||||||
|
|
||||||
|
* **AND** 不使用圆形背景或特殊样式
|
||||||
|
|
||||||
|
* **AND** 使用 `DesignCornerRadiusSm` 动态资源
|
||||||
|
|
||||||
|
#### Scenario: 查找更多组件链接
|
||||||
|
|
||||||
|
* **GIVEN** 窗口底部显示"查找更多组件"链接
|
||||||
|
|
||||||
|
* **WHEN** 用户点击该链接
|
||||||
|
|
||||||
|
* **THEN** 应打开设置窗口的插件目录页面(后续将改为插件市场)
|
||||||
|
|
||||||
|
## MODIFIED Requirements
|
||||||
|
|
||||||
|
### Requirement: 组件列表展示
|
||||||
|
|
||||||
|
原实现使用网格展示所有组件,新实现改为:
|
||||||
|
|
||||||
|
* 左侧列表仅显示分类(复用阑山桌面组件库的分类ID和图标映射)
|
||||||
|
|
||||||
|
* 右侧预览区一次只显示一个组件的详细信息
|
||||||
|
|
||||||
|
* ~~移除搜索功能~~(根据Windows 11设计,暂不提供搜索)
|
||||||
|
|
||||||
|
### Requirement: 关闭按钮圆角规范
|
||||||
|
|
||||||
|
原实现关闭按钮使用硬编码 `CornerRadius="18"`,应改为使用动态资源 `DesignCornerRadiusSm`。
|
||||||
|
|
||||||
|
### Requirement: 分类图标复用
|
||||||
|
|
||||||
|
分类图标映射应与阑山桌面组件库保持一致:
|
||||||
|
|
||||||
|
* Clock -> Symbol.Clock
|
||||||
|
|
||||||
|
* Date -> Symbol.CalendarDate
|
||||||
|
|
||||||
|
* Weather -> Symbol.WeatherSunny
|
||||||
|
|
||||||
|
* Board -> Symbol.Edit
|
||||||
|
|
||||||
|
* Media -> Symbol.Play
|
||||||
|
|
||||||
|
* Info -> Symbol.Info
|
||||||
|
|
||||||
|
* Calculator -> Symbol.Calculator
|
||||||
|
|
||||||
|
* Study -> Symbol.Hourglass
|
||||||
|
|
||||||
|
* 其他 -> Symbol.Apps
|
||||||
|
|
||||||
|
## REMOVED Requirements
|
||||||
|
|
||||||
|
* ~~搜索功能~~:根据Windows 11小组件面板设计,暂不提供搜索功能
|
||||||
|
|
||||||
35
.trae/specs/fused-desktop-library-redesign/tasks.md
Normal file
35
.trae/specs/fused-desktop-library-redesign/tasks.md
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
# Tasks
|
||||||
|
|
||||||
|
- [x] Task 1: 修改 FusedDesktopComponentLibraryWindow.axaml 窗口布局
|
||||||
|
- [x] SubTask 1.1: 重新设计标题栏,使用标准X关闭按钮,移除圆形样式,使用 DesignCornerRadiusSm
|
||||||
|
- [x] SubTask 1.2: 调整窗口整体布局为左侧面板+右侧预览区
|
||||||
|
- [x] SubTask 1.3: 添加底部"查找更多组件"链接区域
|
||||||
|
|
||||||
|
- [x] Task 2: 修改 FusedDesktopComponentLibraryControl.axaml 控件布局
|
||||||
|
- [x] SubTask 2.1: 重新设计左侧面板:仅保留分类列表(移除搜索框)
|
||||||
|
- [x] SubTask 2.2: 重新设计右侧预览区:组件标题 + 大尺寸预览 + 描述 + 添加按钮
|
||||||
|
- [x] SubTask 2.3: 优化分类列表项样式,添加选中状态视觉反馈
|
||||||
|
- [x] SubTask 2.4: 复用阑山桌面组件库的分类图标映射
|
||||||
|
|
||||||
|
- [x] Task 3: 更新 ViewModel 支持新交互模式
|
||||||
|
- [x] SubTask 3.1: 在 ComponentLibraryWindowViewModel 中添加 SelectedComponent 属性
|
||||||
|
- [x] SubTask 3.2: 添加组件描述属性支持
|
||||||
|
|
||||||
|
- [x] Task 4: 更新 FusedDesktopComponentLibraryControl.axaml.cs 代码逻辑
|
||||||
|
- [x] SubTask 4.1: 修改分类选择逻辑,选中分类时显示该分类第一个组件
|
||||||
|
- [x] SubTask 4.2: 添加组件选中逻辑
|
||||||
|
- [x] SubTask 4.3: 移除搜索相关代码
|
||||||
|
- [x] SubTask 4.4: 复用阑山桌面组件库的分类图标和本地化方法
|
||||||
|
- [x] SubTask 4.5: 添加"查找更多组件"链接点击处理(打开设置窗口插件目录)
|
||||||
|
|
||||||
|
- [x] Task 5: 验证和测试
|
||||||
|
- [x] SubTask 5.1: 验证关闭按钮使用动态圆角资源 DesignCornerRadiusSm
|
||||||
|
- [x] SubTask 5.2: 验证窗口布局符合Windows 11小组件面板风格
|
||||||
|
- [x] SubTask 5.3: 验证分类图标与阑山桌面组件库一致
|
||||||
|
- [x] SubTask 5.4: 验证组件添加功能正常工作
|
||||||
|
- [x] SubTask 5.5: 验证"查找更多组件"链接能打开设置窗口
|
||||||
|
|
||||||
|
# Task Dependencies
|
||||||
|
- Task 3 依赖于 Task 1 和 Task 2 的UI设计确定
|
||||||
|
- Task 4 依赖于 Task 3 的ViewModel更新
|
||||||
|
- Task 5 依赖于所有前置任务完成
|
||||||
88
CHANGELOG.md
88
CHANGELOG.md
@@ -1,40 +1,56 @@
|
|||||||
# 更新日志 / Changelog
|
# 更新日志 / Changelog
|
||||||
|
|
||||||
所有重要的更改都将记录在此文件中。
|
## [0.8.3.3](https://github.com/yourorg/LanMountainDesktop/releases/tag/v0.8.3.3) - 2026-04-12
|
||||||
|
|
||||||
格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/),
|
|
||||||
并且本项目遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## [Unreleased]
|
|
||||||
|
|
||||||
### 新增 (Added)
|
### 新增 (Added)
|
||||||
- 待发布的新功能
|
|
||||||
|
- ✨ **便签组件**: 全新便签组件上线,支持 Markdown 语法
|
||||||
|
- 支持丰富的 Markdown 格式:标题、列表、加粗、斜体、代码块等
|
||||||
|
- 便签内容自动保存,方便记录和管理日常备忘。丰富信息展示途径,让作业布置也可在阑山桌面完成。
|
||||||
|
- ✨ **白板主题自适应笔色**: 白板功能新增主题自适应笔色支持
|
||||||
|
- 根据当前主题自动调整画笔颜色,确保在不同主题下都有良好的书写体验
|
||||||
|
- 深色主题下自动切换为浅色笔迹,浅色主题下使用深色笔迹
|
||||||
|
|
||||||
### 变更 (Changed)
|
### 变更 (Changed)
|
||||||
- 待发布的变更
|
|
||||||
|
- 🎨 **融合桌面设置组件库样式更新**: 优化融合桌面设置页面的组件库样式
|
||||||
|
- 提升视觉一致性和用户体验
|
||||||
|
- 统一组件风格,与整体设计语言保持协调
|
||||||
|
|
||||||
### 修复 (Fixed)
|
### 修复 (Fixed)
|
||||||
- 待发布的修复
|
|
||||||
|
- 🐛 **白板无法使用问题**: 修复了白板功能无法正常使用的问题
|
||||||
|
- 问题原因: 相关依赖或初始化逻辑异常导致白板功能失效
|
||||||
|
- 修复方案: 修复了白板的依赖加载和初始化流程,恢复正常使用
|
||||||
|
- 🐛 **央官网新闻组件显示问题**: 修复了央官网新闻组件的显示异常
|
||||||
|
- 优化组件渲染逻辑,确保新闻内容正确展示
|
||||||
|
- 🐛 **课程表组件显示问题**: 修复了课程表组件的显示异常
|
||||||
|
- 优化组件布局和渲染,确保课程信息正确显示
|
||||||
|
- 🐛 **轻量版 .NET 10 依赖问题(实验性)**: 实验性修复了轻量版在 .NET 10 环境下的依赖问题
|
||||||
|
- 问题原因: 轻量版与 .NET 10 的依赖兼容性存在冲突
|
||||||
|
- 修复方案: 调整依赖配置,提升与 .NET 10 的兼容性(实验性修复,持续观察中)
|
||||||
|
|
||||||
### 移除 (Removed)
|
### 移除 (Removed)
|
||||||
- 待发布的移除项
|
|
||||||
|
|
||||||
---
|
- 无
|
||||||
|
|
||||||
## [0.8.3.2] - 2026-04-09
|
***
|
||||||
|
|
||||||
|
## [0.8.3.2](https://github.com/yourorg/LanMountainDesktop/releases/tag/v0.8.3.2) - 2026-04-09
|
||||||
|
|
||||||
### 新增 (Added)
|
### 新增 (Added)
|
||||||
|
|
||||||
- ✨ **应用启动台图标卡片显示选项**: 新增应用启动台图标卡片显示设置
|
- ✨ **应用启动台图标卡片显示选项**: 新增应用启动台图标卡片显示设置
|
||||||
- 用户可在设置中选择是否显示应用图标的专属卡片背景
|
- 用户可在设置中选择是否显示应用图标的专属卡片背景
|
||||||
- 关闭后仅显示应用图标本身,更加简洁
|
- 关闭后仅显示应用图标本身,更加简洁
|
||||||
- 支持动态切换,实时预览效果
|
- 支持动态切换,实时预览效果
|
||||||
|
|
||||||
### 变更 (Changed)
|
### 变更 (Changed)
|
||||||
|
|
||||||
- 无
|
- 无
|
||||||
|
|
||||||
### 修复 (Fixed)
|
### 修复 (Fixed)
|
||||||
|
|
||||||
- 🐛 **应用启动台文件夹应用数量限制**: 修复了应用启动台文件夹无法查看超过12个应用的问题
|
- 🐛 **应用启动台文件夹应用数量限制**: 修复了应用启动台文件夹无法查看超过12个应用的问题
|
||||||
- 问题原因: 文件夹弹窗未实现滚动功能,应用列表超出显示区域后被截断
|
- 问题原因: 文件夹弹窗未实现滚动功能,应用列表超出显示区域后被截断
|
||||||
- 修复方案: 为文件夹内容区域添加滚动支持,允许用户滚动查看所有应用
|
- 修复方案: 为文件夹内容区域添加滚动支持,允许用户滚动查看所有应用
|
||||||
@@ -46,13 +62,15 @@
|
|||||||
- 修复方案: 在 `IncrementalUpdateItems()` 方法中同步更新课程项的文字颜色
|
- 修复方案: 在 `IncrementalUpdateItems()` 方法中同步更新课程项的文字颜色
|
||||||
|
|
||||||
### 移除 (Removed)
|
### 移除 (Removed)
|
||||||
|
|
||||||
- 🗑️ **更新页面重复标题**: 移除了更新页面中重复的更新标题,优化页面布局
|
- 🗑️ **更新页面重复标题**: 移除了更新页面中重复的更新标题,优化页面布局
|
||||||
|
|
||||||
---
|
***
|
||||||
|
|
||||||
## [0.8.3.1] - 2026-04-08
|
## [0.8.3.1](https://github.com/yourorg/LanMountainDesktop/releases/tag/v0.8.3.1) - 2026-04-08
|
||||||
|
|
||||||
### 新增 (Added)
|
### 新增 (Added)
|
||||||
|
|
||||||
- ✨ **快捷方式组件**: 新增快捷方式组件,可在阑山桌面内便捷打开系统应用与文件
|
- ✨ **快捷方式组件**: 新增快捷方式组件,可在阑山桌面内便捷打开系统应用与文件
|
||||||
- 支持创建快捷方式,统一管理应用和文件
|
- 支持创建快捷方式,统一管理应用和文件
|
||||||
- 提供单击打开和双击打开两种交互模式
|
- 提供单击打开和双击打开两种交互模式
|
||||||
@@ -60,15 +78,45 @@
|
|||||||
- 📝 初始化更新日志文档,为后续版本发布建立基础
|
- 📝 初始化更新日志文档,为后续版本发布建立基础
|
||||||
|
|
||||||
### 变更 (Changed)
|
### 变更 (Changed)
|
||||||
|
|
||||||
- 无
|
- 无
|
||||||
|
|
||||||
### 修复 (Fixed)
|
### 修复 (Fixed)
|
||||||
|
|
||||||
- 无
|
- 无
|
||||||
|
|
||||||
### 移除 (Removed)
|
### 移除 (Removed)
|
||||||
|
|
||||||
- 无
|
- 无
|
||||||
|
|
||||||
---
|
***
|
||||||
|
|
||||||
|
所有重要的更改都将记录在此文件中。
|
||||||
|
|
||||||
|
格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/),
|
||||||
|
并且本项目遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
|
||||||
|
|
||||||
|
***
|
||||||
|
|
||||||
|
## \[格式示例]
|
||||||
|
|
||||||
|
### 新增 (Added)
|
||||||
|
|
||||||
|
- 待发布的新功能
|
||||||
|
|
||||||
|
### 变更 (Changed)
|
||||||
|
|
||||||
|
- 待发布的变更
|
||||||
|
|
||||||
|
### 修复 (Fixed)
|
||||||
|
|
||||||
|
- 待发布的修复
|
||||||
|
|
||||||
|
### 移除 (Removed)
|
||||||
|
|
||||||
|
- 待发布的移除项
|
||||||
|
|
||||||
|
***
|
||||||
|
|
||||||
## 版本说明
|
## 版本说明
|
||||||
|
|
||||||
@@ -101,10 +149,6 @@
|
|||||||
- 🔒 **安全**: 安全相关
|
- 🔒 **安全**: 安全相关
|
||||||
- 🌐 **国际化**: 国际化/本地化
|
- 🌐 **国际化**: 国际化/本地化
|
||||||
|
|
||||||
---
|
***
|
||||||
|
|
||||||
## 链接
|
## 链接
|
||||||
|
|
||||||
[Unreleased]: https://github.com/yourorg/LanMountainDesktop/compare/v0.8.3.2...HEAD
|
|
||||||
[0.8.3.2]: https://github.com/yourorg/LanMountainDesktop/releases/tag/v0.8.3.2
|
|
||||||
[0.8.3.1]: https://github.com/yourorg/LanMountainDesktop/releases/tag/v0.8.3.1
|
|
||||||
|
|||||||
109
LanMountainDesktop.PluginSdk/AppearanceChangedEvent.cs
Normal file
109
LanMountainDesktop.PluginSdk/AppearanceChangedEvent.cs
Normal file
@@ -0,0 +1,109 @@
|
|||||||
|
namespace LanMountainDesktop.PluginSdk;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 外观变更事件参数,当主题、圆角或其他外观属性变化时触发。
|
||||||
|
/// </summary>
|
||||||
|
public sealed class AppearanceChangedEvent : EventArgs
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 创建外观变更事件实例。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="snapshot">当前外观快照</param>
|
||||||
|
/// <param name="changedProperties">变更的属性集合</param>
|
||||||
|
public AppearanceChangedEvent(
|
||||||
|
PluginAppearanceSnapshot snapshot,
|
||||||
|
IReadOnlyCollection<AppearanceProperty> changedProperties)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(snapshot);
|
||||||
|
ArgumentNullException.ThrowIfNull(changedProperties);
|
||||||
|
|
||||||
|
Snapshot = snapshot;
|
||||||
|
ChangedProperties = changedProperties;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 当前外观快照。
|
||||||
|
/// </summary>
|
||||||
|
public PluginAppearanceSnapshot Snapshot { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 变更的属性集合。
|
||||||
|
/// </summary>
|
||||||
|
public IReadOnlyCollection<AppearanceProperty> ChangedProperties { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 圆角是否发生变化。
|
||||||
|
/// </summary>
|
||||||
|
public bool CornerRadiusChanged => ChangedProperties.Contains(AppearanceProperty.CornerRadius);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 主题变体(亮色/暗色)是否发生变化。
|
||||||
|
/// </summary>
|
||||||
|
public bool ThemeVariantChanged => ChangedProperties.Contains(AppearanceProperty.ThemeVariant);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 强调色是否发生变化。
|
||||||
|
/// </summary>
|
||||||
|
public bool AccentColorChanged => ChangedProperties.Contains(AppearanceProperty.AccentColor);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 圆角风格是否发生变化。
|
||||||
|
/// </summary>
|
||||||
|
public bool CornerRadiusStyleChanged => ChangedProperties.Contains(AppearanceProperty.CornerRadiusStyle);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 检查指定属性是否发生变化。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="property">要检查的属性</param>
|
||||||
|
/// <returns>如果属性发生变化则返回 true</returns>
|
||||||
|
public bool HasChanged(AppearanceProperty property)
|
||||||
|
{
|
||||||
|
return ChangedProperties.Contains(property);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 检查是否有任何外观属性发生变化。
|
||||||
|
/// </summary>
|
||||||
|
public bool HasAnyChanges => ChangedProperties.Count > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 可变更的外观属性枚举。
|
||||||
|
/// </summary>
|
||||||
|
public enum AppearanceProperty
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 圆角Token值发生变化。
|
||||||
|
/// </summary>
|
||||||
|
CornerRadius,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 主题变体(亮色/暗色)发生变化。
|
||||||
|
/// </summary>
|
||||||
|
ThemeVariant,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 强调色发生变化。
|
||||||
|
/// </summary>
|
||||||
|
AccentColor,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 圆角风格(Sharp/Balanced/Rounded/Open)发生变化。
|
||||||
|
/// </summary>
|
||||||
|
CornerRadiusStyle,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 壁纸发生变化。
|
||||||
|
/// </summary>
|
||||||
|
Wallpaper,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 系统材质模式发生变化。
|
||||||
|
/// </summary>
|
||||||
|
SystemMaterialMode,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 所有外观属性(用于批量更新)。
|
||||||
|
/// </summary>
|
||||||
|
All
|
||||||
|
}
|
||||||
@@ -1,10 +1,35 @@
|
|||||||
namespace LanMountainDesktop.PluginSdk;
|
namespace LanMountainDesktop.PluginSdk;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 插件外观上下文接口,提供主题、圆角等外观资源的访问和变更通知。
|
||||||
|
/// </summary>
|
||||||
public interface IPluginAppearanceContext
|
public interface IPluginAppearanceContext
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 当前外观快照。
|
||||||
|
/// </summary>
|
||||||
PluginAppearanceSnapshot Snapshot { get; }
|
PluginAppearanceSnapshot Snapshot { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 外观变更事件。当主题、圆角或其他外观属性发生变化时触发。
|
||||||
|
/// </summary>
|
||||||
|
event EventHandler<AppearanceChangedEvent>? Changed;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 解析带缩放的圆角半径。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="baseRadius">基础圆角半径</param>
|
||||||
|
/// <param name="minimum">最小值(可选)</param>
|
||||||
|
/// <param name="maximum">最大值(可选)</param>
|
||||||
|
/// <returns>解析后的圆角半径</returns>
|
||||||
double ResolveScaledCornerRadius(double baseRadius, double? minimum = null, double? maximum = null);
|
double ResolveScaledCornerRadius(double baseRadius, double? minimum = null, double? maximum = null);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据预设解析圆角半径。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="preset">圆角预设</param>
|
||||||
|
/// <param name="minimum">最小值(可选)</param>
|
||||||
|
/// <param name="maximum">最大值(可选)</param>
|
||||||
|
/// <returns>解析后的圆角半径</returns>
|
||||||
double ResolveCornerRadius(PluginCornerRadiusPreset preset, double? minimum = null, double? maximum = null);
|
double ResolveCornerRadius(PluginCornerRadiusPreset preset, double? minimum = null, double? maximum = null);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,22 @@
|
|||||||
namespace LanMountainDesktop.PluginSdk;
|
namespace LanMountainDesktop.PluginSdk;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 插件外观上下文实现,提供主题、圆角等外观资源的访问和变更通知。
|
||||||
|
/// </summary>
|
||||||
public sealed class PluginAppearanceContext : IPluginAppearanceContext
|
public sealed class PluginAppearanceContext : IPluginAppearanceContext
|
||||||
{
|
{
|
||||||
|
private PluginAppearanceSnapshot _snapshot;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建插件外观上下文实例。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="snapshot">初始外观快照</param>
|
||||||
public PluginAppearanceContext(PluginAppearanceSnapshot snapshot)
|
public PluginAppearanceContext(PluginAppearanceSnapshot snapshot)
|
||||||
{
|
{
|
||||||
ArgumentNullException.ThrowIfNull(snapshot);
|
ArgumentNullException.ThrowIfNull(snapshot);
|
||||||
ArgumentNullException.ThrowIfNull(snapshot.CornerRadiusTokens);
|
ArgumentNullException.ThrowIfNull(snapshot.CornerRadiusTokens);
|
||||||
|
|
||||||
Snapshot = snapshot with
|
_snapshot = snapshot with
|
||||||
{
|
{
|
||||||
ThemeVariant = string.IsNullOrWhiteSpace(snapshot.ThemeVariant)
|
ThemeVariant = string.IsNullOrWhiteSpace(snapshot.ThemeVariant)
|
||||||
? "Unknown"
|
? "Unknown"
|
||||||
@@ -15,8 +24,37 @@ public sealed class PluginAppearanceContext : IPluginAppearanceContext
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public PluginAppearanceSnapshot Snapshot { get; }
|
/// <inheritdoc />
|
||||||
|
public PluginAppearanceSnapshot Snapshot => _snapshot;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public event EventHandler<AppearanceChangedEvent>? Changed;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新外观快照并触发变更事件。
|
||||||
|
/// 此方法由宿主调用,用于在主题、圆角等外观属性变化时通知插件。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="newSnapshot">新的外观快照</param>
|
||||||
|
/// <param name="changedProperties">变更的属性集合</param>
|
||||||
|
public void UpdateSnapshot(PluginAppearanceSnapshot newSnapshot, IReadOnlyCollection<AppearanceProperty> changedProperties)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(newSnapshot);
|
||||||
|
ArgumentNullException.ThrowIfNull(changedProperties);
|
||||||
|
|
||||||
|
_snapshot = newSnapshot with
|
||||||
|
{
|
||||||
|
ThemeVariant = string.IsNullOrWhiteSpace(newSnapshot.ThemeVariant)
|
||||||
|
? "Unknown"
|
||||||
|
: newSnapshot.ThemeVariant.Trim()
|
||||||
|
};
|
||||||
|
|
||||||
|
if (changedProperties.Count > 0)
|
||||||
|
{
|
||||||
|
Changed?.Invoke(this, new AppearanceChangedEvent(_snapshot, changedProperties));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
public double ResolveScaledCornerRadius(double baseRadius, double? minimum = null, double? maximum = null)
|
public double ResolveScaledCornerRadius(double baseRadius, double? minimum = null, double? maximum = null)
|
||||||
{
|
{
|
||||||
var value = Math.Max(0d, baseRadius);
|
var value = Math.Max(0d, baseRadius);
|
||||||
@@ -30,16 +68,17 @@ public sealed class PluginAppearanceContext : IPluginAppearanceContext
|
|||||||
return Math.Clamp(value, clampedMin, clampedMax);
|
return Math.Clamp(value, clampedMin, clampedMax);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
public double ResolveCornerRadius(PluginCornerRadiusPreset preset, double? minimum = null, double? maximum = null)
|
public double ResolveCornerRadius(PluginCornerRadiusPreset preset, double? minimum = null, double? maximum = null)
|
||||||
{
|
{
|
||||||
var resolved = Math.Max(0d, Snapshot.CornerRadiusTokens.Get(preset));
|
var resolved = Math.Max(0d, _snapshot.CornerRadiusTokens.Get(preset));
|
||||||
if (!minimum.HasValue && !maximum.HasValue)
|
if (!minimum.HasValue && !maximum.HasValue)
|
||||||
{
|
{
|
||||||
return resolved;
|
return resolved;
|
||||||
}
|
}
|
||||||
|
|
||||||
var clampedMin = minimum ?? resolved;
|
var clampedMin = minimum ?? 0d;
|
||||||
var clampedMax = maximum ?? resolved;
|
var clampedMax = maximum ?? double.MaxValue;
|
||||||
if (clampedMin > clampedMax)
|
if (clampedMin > clampedMax)
|
||||||
{
|
{
|
||||||
(clampedMin, clampedMax) = (clampedMax, clampedMin);
|
(clampedMin, clampedMax) = (clampedMax, clampedMin);
|
||||||
|
|||||||
137
LanMountainDesktop.PluginSdk/PluginAppearanceHelper.cs
Normal file
137
LanMountainDesktop.PluginSdk/PluginAppearanceHelper.cs
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
using Avalonia;
|
||||||
|
|
||||||
|
namespace LanMountainDesktop.PluginSdk;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 插件外观辅助方法,提供统一的圆角和主题资源访问。
|
||||||
|
/// </summary>
|
||||||
|
public static class PluginAppearanceHelper
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 获取桌面组件主外壳圆角半径。
|
||||||
|
/// 这是组件最外层边框应该使用的圆角值,对应 DesignCornerRadiusComponent 资源。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">外观上下文</param>
|
||||||
|
/// <returns>主外壳圆角半径(像素)</returns>
|
||||||
|
public static double GetShellCornerRadius(this IPluginAppearanceContext context)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(context);
|
||||||
|
return context.ResolveCornerRadius(PluginCornerRadiusPreset.Component);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取内部卡片圆角半径。
|
||||||
|
/// 用于组件内部的次级卡片、内容区块等。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">外观上下文</param>
|
||||||
|
/// <returns>内部卡片圆角半径(像素)</returns>
|
||||||
|
public static double GetCardCornerRadius(this IPluginAppearanceContext context)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(context);
|
||||||
|
return context.ResolveCornerRadius(PluginCornerRadiusPreset.Sm);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取控件圆角半径。
|
||||||
|
/// 用于按钮、输入框、标签等交互控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">外观上下文</param>
|
||||||
|
/// <returns>控件圆角半径(像素)</returns>
|
||||||
|
public static double GetControlCornerRadius(this IPluginAppearanceContext context)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(context);
|
||||||
|
return context.ResolveCornerRadius(PluginCornerRadiusPreset.Xs);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取徽章/标签圆角半径。
|
||||||
|
/// 用于小徽章、标签、角标等微元素。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">外观上下文</param>
|
||||||
|
/// <returns>徽章圆角半径(像素)</returns>
|
||||||
|
public static double GetBadgeCornerRadius(this IPluginAppearanceContext context)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(context);
|
||||||
|
return context.ResolveCornerRadius(PluginCornerRadiusPreset.Micro);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取中等面板圆角半径。
|
||||||
|
/// 用于悬浮菜单、小提示框、子面板等。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">外观上下文</param>
|
||||||
|
/// <returns>中等面板圆角半径(像素)</returns>
|
||||||
|
public static double GetMediumPanelCornerRadius(this IPluginAppearanceContext context)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(context);
|
||||||
|
return context.ResolveCornerRadius(PluginCornerRadiusPreset.Md);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取大面板圆角半径。
|
||||||
|
/// 用于对话框、设置面板等大型容器(非桌面组件)。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">外观上下文</param>
|
||||||
|
/// <returns>大面板圆角半径(像素)</returns>
|
||||||
|
public static double GetLargePanelCornerRadius(this IPluginAppearanceContext context)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(context);
|
||||||
|
return context.ResolveCornerRadius(PluginCornerRadiusPreset.Lg);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 将圆角预设转换为 Avalonia CornerRadius。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">外观上下文</param>
|
||||||
|
/// <param name="preset">圆角预设</param>
|
||||||
|
/// <returns>Avalonia CornerRadius 结构</returns>
|
||||||
|
public static CornerRadius ToCornerRadius(this IPluginAppearanceContext context, PluginCornerRadiusPreset preset)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(context);
|
||||||
|
var radius = context.ResolveCornerRadius(preset);
|
||||||
|
return new CornerRadius(radius);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取当前主题变体(亮色/暗色)。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">外观上下文</param>
|
||||||
|
/// <returns>是否为暗色主题</returns>
|
||||||
|
public static bool IsDarkTheme(this IPluginAppearanceContext context)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(context);
|
||||||
|
return string.Equals(context.Snapshot.ThemeVariant, "Dark", StringComparison.OrdinalIgnoreCase);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取当前主题变体字符串。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context">外观上下文</param>
|
||||||
|
/// <returns>主题变体字符串("Light" 或 "Dark")</returns>
|
||||||
|
public static string GetThemeVariant(this IPluginAppearanceContext context)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(context);
|
||||||
|
return context.Snapshot.ThemeVariant;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 内部元素层级,用于区分不同层级的圆角需求。
|
||||||
|
/// </summary>
|
||||||
|
public enum InnerElementLevel
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 内部卡片:使用 Sm token(14px @ 1.0x)
|
||||||
|
/// </summary>
|
||||||
|
Card,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 交互控件:使用 Xs token(12px @ 1.0x)
|
||||||
|
/// </summary>
|
||||||
|
Control,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 微元素徽章:使用 Micro token(6px @ 1.0x)
|
||||||
|
/// </summary>
|
||||||
|
Badge
|
||||||
|
}
|
||||||
@@ -72,14 +72,11 @@ public sealed class PluginDesktopComponentRegistration
|
|||||||
var resolved = CornerRadiusResolver is not null
|
var resolved = CornerRadiusResolver is not null
|
||||||
? CornerRadiusResolver(appearance, Math.Max(1d, cellSize))
|
? CornerRadiusResolver(appearance, Math.Max(1d, cellSize))
|
||||||
: CornerRadiusPreset == PluginCornerRadiusPreset.Default
|
: CornerRadiusPreset == PluginCornerRadiusPreset.Default
|
||||||
? appearance.ResolveScaledCornerRadius(
|
? appearance.ResolveCornerRadius(PluginCornerRadiusPreset.Component)
|
||||||
Math.Clamp(Math.Max(1d, cellSize) * 0.22, 8, 18),
|
|
||||||
8,
|
|
||||||
18)
|
|
||||||
: appearance.ResolveCornerRadius(CornerRadiusPreset);
|
: appearance.ResolveCornerRadius(CornerRadiusPreset);
|
||||||
|
|
||||||
return double.IsFinite(resolved)
|
return double.IsFinite(resolved)
|
||||||
? Math.Max(0d, resolved)
|
? Math.Max(0d, resolved)
|
||||||
: appearance.ResolveCornerRadius(PluginCornerRadiusPreset.Default);
|
: appearance.ResolveCornerRadius(PluginCornerRadiusPreset.Component);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,10 +35,11 @@ public sealed class CornerRadiusStyleTests
|
|||||||
Component: 24d),
|
Component: 24d),
|
||||||
ThemeVariant: "Light"));
|
ThemeVariant: "Light"));
|
||||||
|
|
||||||
// Preset resolution should return fixed values from tokens regardless of any legacy scale
|
// Preset resolution should return fixed values from tokens
|
||||||
Assert.Equal(20d, context.ResolveCornerRadius(PluginCornerRadiusPreset.Md), 3);
|
Assert.Equal(20d, context.ResolveCornerRadius(PluginCornerRadiusPreset.Md), 3);
|
||||||
Assert.Equal(20d, context.ResolveCornerRadius(PluginCornerRadiusPreset.Md, maximum: 15d), 3);
|
Assert.Equal(15d, context.ResolveCornerRadius(PluginCornerRadiusPreset.Md, maximum: 15d), 3);
|
||||||
Assert.Equal(20d, context.ResolveScaledCornerRadius(18d), 3);
|
// ResolveScaledCornerRadius returns baseRadius as-is when no min/max specified
|
||||||
|
Assert.Equal(18d, context.ResolveScaledCornerRadius(18d), 3);
|
||||||
Assert.Equal(24d, context.ResolveCornerRadius(PluginCornerRadiusPreset.Component), 3);
|
Assert.Equal(24d, context.ResolveCornerRadius(PluginCornerRadiusPreset.Component), 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,8 +61,12 @@ public sealed class CornerRadiusStyleTests
|
|||||||
96d,
|
96d,
|
||||||
appearanceContext);
|
appearanceContext);
|
||||||
|
|
||||||
Assert.Equal(24d, context.ResolveScaledCornerRadius(12d), 3);
|
// ResolveScaledCornerRadius returns baseRadius as-is when no min/max specified
|
||||||
Assert.Equal(24d, context.ResolveScaledCornerRadius(12d, 8d, 18d), 3);
|
Assert.Equal(12d, context.ResolveScaledCornerRadius(12d), 3);
|
||||||
|
// When min/max specified, value is clamped
|
||||||
|
Assert.Equal(12d, context.ResolveScaledCornerRadius(12d, 8d, 18d), 3);
|
||||||
|
// Component token access
|
||||||
|
Assert.Equal(24d, context.CornerRadiusTokens.Component, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
private sealed class NullServiceProvider : IServiceProvider
|
private sealed class NullServiceProvider : IServiceProvider
|
||||||
|
|||||||
@@ -47,4 +47,5 @@ public static class BuiltInComponentIds
|
|||||||
public const string DesktopFileManager = "DesktopFileManager";
|
public const string DesktopFileManager = "DesktopFileManager";
|
||||||
public const string DesktopNotificationBox = "DesktopNotificationBox";
|
public const string DesktopNotificationBox = "DesktopNotificationBox";
|
||||||
public const string DesktopShortcut = "DesktopShortcut";
|
public const string DesktopShortcut = "DesktopShortcut";
|
||||||
|
public const string DesktopStickyNote = "DesktopStickyNote";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -327,6 +327,16 @@ public sealed class ComponentRegistry
|
|||||||
AllowStatusBarPlacement: false,
|
AllowStatusBarPlacement: false,
|
||||||
AllowDesktopPlacement: true,
|
AllowDesktopPlacement: true,
|
||||||
ResizeMode: DesktopComponentResizeMode.Free),
|
ResizeMode: DesktopComponentResizeMode.Free),
|
||||||
|
new DesktopComponentDefinition(
|
||||||
|
BuiltInComponentIds.DesktopStickyNote,
|
||||||
|
"Sticky Note",
|
||||||
|
"Notepad",
|
||||||
|
"Board",
|
||||||
|
MinWidthCells: 2,
|
||||||
|
MinHeightCells: 2,
|
||||||
|
AllowStatusBarPlacement: false,
|
||||||
|
AllowDesktopPlacement: true,
|
||||||
|
ResizeMode: DesktopComponentResizeMode.Free),
|
||||||
new DesktopComponentDefinition(
|
new DesktopComponentDefinition(
|
||||||
BuiltInComponentIds.DesktopBrowser,
|
BuiltInComponentIds.DesktopBrowser,
|
||||||
"Browser",
|
"Browser",
|
||||||
|
|||||||
@@ -2,12 +2,12 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<TargetFramework>net10.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
|
<RollForward>LatestMajor</RollForward>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<Version>1.0.0</Version>
|
<Version>1.0.0</Version>
|
||||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||||
<ApplicationIcon>Assets\logo_nightly.ico</ApplicationIcon>
|
<ApplicationIcon>Assets\logo_nightly.ico</ApplicationIcon>
|
||||||
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
|
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
|
||||||
<SelfContained Condition="'$(RuntimeIdentifier)' != ''">true</SelfContained>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Keep Release defaults compatibility-first for desktop dependencies (WebView/interop/reflection). -->
|
<!-- Keep Release defaults compatibility-first for desktop dependencies (WebView/interop/reflection). -->
|
||||||
|
|||||||
@@ -698,6 +698,7 @@
|
|||||||
"component.editor.placement_label": "Placement ID",
|
"component.editor.placement_label": "Placement ID",
|
||||||
"component.editor.scope_label": "Scope",
|
"component.editor.scope_label": "Scope",
|
||||||
"component.editor.scope_instance": "Instance-scoped editor",
|
"component.editor.scope_instance": "Instance-scoped editor",
|
||||||
|
"component_category.all": "All",
|
||||||
"component_category.clock": "Clock",
|
"component_category.clock": "Clock",
|
||||||
"component_category.date": "Calendar",
|
"component_category.date": "Calendar",
|
||||||
"component_category.weather": "Weather",
|
"component_category.weather": "Weather",
|
||||||
|
|||||||
@@ -692,6 +692,7 @@
|
|||||||
"component.editor.placement_label": "实例 ID",
|
"component.editor.placement_label": "实例 ID",
|
||||||
"component.editor.scope_label": "作用域",
|
"component.editor.scope_label": "作用域",
|
||||||
"component.editor.scope_instance": "实例级编辑器",
|
"component.editor.scope_instance": "实例级编辑器",
|
||||||
|
"component_category.all": "全部",
|
||||||
"component_category.clock": "时钟",
|
"component_category.clock": "时钟",
|
||||||
"component_category.date": "日历",
|
"component_category.date": "日历",
|
||||||
"component_category.weather": "天气",
|
"component_category.weather": "天气",
|
||||||
|
|||||||
@@ -142,6 +142,12 @@ public sealed class ComponentSettingsSnapshot
|
|||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region Sticky Note Component Settings (便签组件设置)
|
||||||
|
|
||||||
|
public string StickyNoteContent { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
public ComponentSettingsSnapshot Clone()
|
public ComponentSettingsSnapshot Clone()
|
||||||
{
|
{
|
||||||
var clone = (ComponentSettingsSnapshot)MemberwiseClone();
|
var clone = (ComponentSettingsSnapshot)MemberwiseClone();
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ namespace LanMountainDesktop.ViewModels;
|
|||||||
public sealed class ComponentLibraryWindowViewModel : ViewModelBase
|
public sealed class ComponentLibraryWindowViewModel : ViewModelBase
|
||||||
{
|
{
|
||||||
private string _title = "Widgets";
|
private string _title = "Widgets";
|
||||||
|
private ComponentLibraryItemViewModel? _selectedComponent;
|
||||||
|
|
||||||
public string Title
|
public string Title
|
||||||
{
|
{
|
||||||
@@ -20,6 +21,12 @@ public sealed class ComponentLibraryWindowViewModel : ViewModelBase
|
|||||||
public ObservableCollection<ComponentLibraryCategoryViewModel> Categories { get; } = [];
|
public ObservableCollection<ComponentLibraryCategoryViewModel> Categories { get; } = [];
|
||||||
|
|
||||||
public ObservableCollection<ComponentLibraryItemViewModel> Components { get; } = [];
|
public ObservableCollection<ComponentLibraryItemViewModel> Components { get; } = [];
|
||||||
|
|
||||||
|
public ComponentLibraryItemViewModel? SelectedComponent
|
||||||
|
{
|
||||||
|
get => _selectedComponent;
|
||||||
|
set => SetProperty(ref _selectedComponent, value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public sealed class ComponentLibraryCategoryViewModel
|
public sealed class ComponentLibraryCategoryViewModel
|
||||||
@@ -51,6 +58,7 @@ public sealed class ComponentLibraryItemViewModel
|
|||||||
private readonly string _loadingPreviewText;
|
private readonly string _loadingPreviewText;
|
||||||
private readonly string _previewUnavailableText;
|
private readonly string _previewUnavailableText;
|
||||||
private string _displayName;
|
private string _displayName;
|
||||||
|
private string? _description;
|
||||||
private ComponentPreviewKey _previewKey;
|
private ComponentPreviewKey _previewKey;
|
||||||
private ComponentPreviewImageEntry? _previewImageEntry;
|
private ComponentPreviewImageEntry? _previewImageEntry;
|
||||||
private ComponentPreviewImageState _previewState;
|
private ComponentPreviewImageState _previewState;
|
||||||
@@ -61,12 +69,14 @@ public sealed class ComponentLibraryItemViewModel
|
|||||||
string componentId,
|
string componentId,
|
||||||
string displayName,
|
string displayName,
|
||||||
ComponentPreviewKey previewKey,
|
ComponentPreviewKey previewKey,
|
||||||
|
string? description = null,
|
||||||
string loadingPreviewText = "Loading preview...",
|
string loadingPreviewText = "Loading preview...",
|
||||||
string previewUnavailableText = "Preview unavailable",
|
string previewUnavailableText = "Preview unavailable",
|
||||||
ComponentPreviewImageEntry? previewImageEntry = null)
|
ComponentPreviewImageEntry? previewImageEntry = null)
|
||||||
{
|
{
|
||||||
ComponentId = componentId;
|
ComponentId = componentId;
|
||||||
_displayName = displayName;
|
_displayName = displayName;
|
||||||
|
_description = description;
|
||||||
_previewKey = previewKey;
|
_previewKey = previewKey;
|
||||||
_loadingPreviewText = loadingPreviewText;
|
_loadingPreviewText = loadingPreviewText;
|
||||||
_previewUnavailableText = previewUnavailableText;
|
_previewUnavailableText = previewUnavailableText;
|
||||||
@@ -82,6 +92,12 @@ public sealed class ComponentLibraryItemViewModel
|
|||||||
set => SetProperty(ref _displayName, value);
|
set => SetProperty(ref _displayName, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string? Description
|
||||||
|
{
|
||||||
|
get => _description;
|
||||||
|
set => SetProperty(ref _description, value);
|
||||||
|
}
|
||||||
|
|
||||||
public ComponentPreviewKey PreviewKey
|
public ComponentPreviewKey PreviewKey
|
||||||
{
|
{
|
||||||
get => _previewKey;
|
get => _previewKey;
|
||||||
|
|||||||
@@ -94,6 +94,7 @@ public partial class ComponentLibraryWindow : Window
|
|||||||
entry.ComponentId,
|
entry.ComponentId,
|
||||||
displayName,
|
displayName,
|
||||||
previewKey,
|
previewKey,
|
||||||
|
description: null,
|
||||||
_localize?.Invoke("component_library.preview.loading", "Loading preview...") ?? "Loading preview...",
|
_localize?.Invoke("component_library.preview.loading", "Loading preview...") ?? "Loading preview...",
|
||||||
_localize?.Invoke("component_library.preview.unavailable", "Preview unavailable") ?? "Preview unavailable",
|
_localize?.Invoke("component_library.preview.unavailable", "Preview unavailable") ?? "Preview unavailable",
|
||||||
previewEntry);
|
previewEntry);
|
||||||
|
|||||||
@@ -34,11 +34,13 @@
|
|||||||
<TextBlock x:Name="WeekdayTextBlock"
|
<TextBlock x:Name="WeekdayTextBlock"
|
||||||
Text="周一"
|
Text="周一"
|
||||||
TextAlignment="Right"
|
TextAlignment="Right"
|
||||||
FontWeight="SemiBold" />
|
FontWeight="SemiBold"
|
||||||
|
TextTrimming="CharacterEllipsis" />
|
||||||
<TextBlock x:Name="ClassCountTextBlock"
|
<TextBlock x:Name="ClassCountTextBlock"
|
||||||
Text="0节课"
|
Text="0节课"
|
||||||
TextAlignment="Right"
|
TextAlignment="Right"
|
||||||
FontWeight="SemiBold" />
|
FontWeight="SemiBold"
|
||||||
|
TextTrimming="CharacterEllipsis" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
|
|||||||
@@ -928,7 +928,28 @@ public partial class ClassScheduleWidget : UserControl, IDesktopComponentWidget,
|
|||||||
MetaStack.Spacing = Math.Clamp(6 * scale, 3, 10);
|
MetaStack.Spacing = Math.Clamp(6 * scale, 3, 10);
|
||||||
CourseListPanel.Spacing = Math.Clamp(6 * scale, 3, 10);
|
CourseListPanel.Spacing = Math.Clamp(6 * scale, 3, 10);
|
||||||
|
|
||||||
var dateFont = Math.Clamp(66 * scale, 26, 82);
|
var dateFontByScale = Math.Clamp(66 * scale, 26, 82);
|
||||||
|
var weekdayFontByScale = Math.Clamp(34 * scale, 13, 32);
|
||||||
|
var classCountFontByScale = Math.Clamp(40 * scale, 14, 36);
|
||||||
|
|
||||||
|
// 宽度感知:当头部内容总需求超过可用宽度时,按比例缩小日期字体
|
||||||
|
var availableWidth = Math.Max(1, Bounds.Width - rootPadding.Left - rootPadding.Right);
|
||||||
|
var dateGroupEstimatedWidth = dateFontByScale * 0.6 * 3 + DateGroup.Spacing * 2;
|
||||||
|
var metaStackEstimatedWidth = classCountFontByScale * 0.6 * 4 + MetaStack.Spacing;
|
||||||
|
var headerColumnSpacing = Math.Clamp(10 * scale, 4, 16);
|
||||||
|
var totalHeaderNeed = dateGroupEstimatedWidth + headerColumnSpacing + metaStackEstimatedWidth;
|
||||||
|
|
||||||
|
var dateFont = dateFontByScale;
|
||||||
|
if (totalHeaderNeed > availableWidth)
|
||||||
|
{
|
||||||
|
var shrinkRatio = availableWidth / totalHeaderNeed;
|
||||||
|
dateFont = Math.Max(20, dateFontByScale * shrinkRatio);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 为 HeaderGrid 左列设置最小宽度,防止被压缩至零
|
||||||
|
var minDateColumnWidth = dateFont * 0.6 * 3 + DateGroup.Spacing * 2;
|
||||||
|
HeaderGrid.ColumnDefinitions[0].MinWidth = minDateColumnWidth;
|
||||||
|
|
||||||
MonthTextBlock.FontSize = dateFont;
|
MonthTextBlock.FontSize = dateFont;
|
||||||
DayTextBlock.FontSize = dateFont;
|
DayTextBlock.FontSize = dateFont;
|
||||||
SlashTextBlock.FontSize = dateFont;
|
SlashTextBlock.FontSize = dateFont;
|
||||||
@@ -940,8 +961,8 @@ public partial class ClassScheduleWidget : UserControl, IDesktopComponentWidget,
|
|||||||
ClassCountTextBlock.Foreground = CreateBrush(_isNightVisual ? "#8D95A4" : "#738095");
|
ClassCountTextBlock.Foreground = CreateBrush(_isNightVisual ? "#8D95A4" : "#738095");
|
||||||
StatusTextBlock.Foreground = CreateBrush(_isNightVisual ? "#9AA2B1" : "#4B5565");
|
StatusTextBlock.Foreground = CreateBrush(_isNightVisual ? "#9AA2B1" : "#4B5565");
|
||||||
|
|
||||||
WeekdayTextBlock.FontSize = Math.Clamp(34 * scale, 13, 32);
|
WeekdayTextBlock.FontSize = weekdayFontByScale;
|
||||||
ClassCountTextBlock.FontSize = Math.Clamp(40 * scale, 14, 36);
|
ClassCountTextBlock.FontSize = classCountFontByScale;
|
||||||
StatusTextBlock.FontSize = Math.Clamp(30 * scale, 12, 30);
|
StatusTextBlock.FontSize = Math.Clamp(30 * scale, 12, 30);
|
||||||
|
|
||||||
WeekdayTextBlock.FontWeight = ToVariableWeight(Lerp(560, 700, Math.Clamp((scale - 0.60) / 1.2, 0, 1)));
|
WeekdayTextBlock.FontWeight = ToVariableWeight(Lerp(560, 700, Math.Clamp((scale - 0.60) / 1.2, 0, 1)));
|
||||||
|
|||||||
@@ -704,6 +704,24 @@ public partial class CnrDailyNewsWidget : UserControl, IDesktopComponentWidget,
|
|||||||
ExtraNewsItemsPanel.Spacing = Math.Clamp(6 * scale, 3, 10);
|
ExtraNewsItemsPanel.Spacing = Math.Clamp(6 * scale, 3, 10);
|
||||||
|
|
||||||
ApplyNightModeVisual();
|
ApplyNightModeVisual();
|
||||||
|
|
||||||
|
var headerHeight = refreshHeight;
|
||||||
|
var newsItemHeight = Math.Max(imageHeight, mainNewsMinHeight);
|
||||||
|
|
||||||
|
var requiredHeight = verticalPadding * 2
|
||||||
|
+ headerHeight
|
||||||
|
+ rowSpacing
|
||||||
|
+ newsItemHeight
|
||||||
|
+ rowSpacing
|
||||||
|
+ newsItemHeight;
|
||||||
|
|
||||||
|
if (_extraNewsRows.Count > 0)
|
||||||
|
{
|
||||||
|
var extraSpacing = ExtraNewsItemsPanel.Spacing * (_extraNewsRows.Count - 1);
|
||||||
|
requiredHeight += rowSpacing + extraSpacing + _extraNewsRows.Count * newsItemHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.MinHeight = requiredHeight;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateRefreshButtonState()
|
private void UpdateRefreshButtonState()
|
||||||
@@ -842,6 +860,11 @@ public partial class CnrDailyNewsWidget : UserControl, IDesktopComponentWidget,
|
|||||||
oldBitmap?.Dispose();
|
oldBitmap?.Dispose();
|
||||||
_newsBitmaps[index] = bitmap;
|
_newsBitmaps[index] = bitmap;
|
||||||
imageControl.Source = bitmap;
|
imageControl.Source = bitmap;
|
||||||
|
|
||||||
|
if (bitmap != null)
|
||||||
|
{
|
||||||
|
InvalidateMeasure();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DisposeNewsBitmaps()
|
private void DisposeNewsBitmaps()
|
||||||
|
|||||||
@@ -452,6 +452,10 @@ public sealed class DesktopComponentRuntimeRegistry
|
|||||||
BuiltInComponentIds.DesktopBlackboardLandscape,
|
BuiltInComponentIds.DesktopBlackboardLandscape,
|
||||||
"component.blackboard_landscape",
|
"component.blackboard_landscape",
|
||||||
() => new WhiteboardWidget(baseWidthCells: 4)),
|
() => new WhiteboardWidget(baseWidthCells: 4)),
|
||||||
|
new DesktopComponentRuntimeRegistration(
|
||||||
|
BuiltInComponentIds.DesktopStickyNote,
|
||||||
|
"component.sticky_note",
|
||||||
|
() => new StickyNoteWidget()),
|
||||||
new DesktopComponentRuntimeRegistration(
|
new DesktopComponentRuntimeRegistration(
|
||||||
BuiltInComponentIds.DesktopBrowser,
|
BuiltInComponentIds.DesktopBrowser,
|
||||||
"component.browser",
|
"component.browser",
|
||||||
|
|||||||
51
LanMountainDesktop/Views/Components/StickyNoteWidget.axaml
Normal file
51
LanMountainDesktop/Views/Components/StickyNoteWidget.axaml
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
<UserControl xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:fi="using:FluentIcons.Avalonia"
|
||||||
|
xmlns:md="clr-namespace:Markdown.Avalonia;assembly=Markdown.Avalonia"
|
||||||
|
mc:Ignorable="d"
|
||||||
|
d:DesignWidth="200"
|
||||||
|
d:DesignHeight="200"
|
||||||
|
x:Class="LanMountainDesktop.Views.Components.StickyNoteWidget">
|
||||||
|
|
||||||
|
<Border x:Name="RootBorder"
|
||||||
|
CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
|
||||||
|
BorderBrush="#E0C878"
|
||||||
|
BorderThickness="1">
|
||||||
|
<Grid>
|
||||||
|
<md:MarkdownScrollViewer x:Name="MarkdownViewer"
|
||||||
|
Margin="14,14,14,10"
|
||||||
|
IsVisible="True" />
|
||||||
|
|
||||||
|
<TextBox x:Name="NoteTextBox"
|
||||||
|
AcceptsReturn="True"
|
||||||
|
TextWrapping="Wrap"
|
||||||
|
IsVisible="False"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
Margin="14,14,14,10"
|
||||||
|
FontFamily="Consolas,Cascadia Code,Courier New,monospace"
|
||||||
|
Foreground="#5D4E37" />
|
||||||
|
|
||||||
|
<Button x:Name="ToggleButton"
|
||||||
|
Width="28"
|
||||||
|
Height="28"
|
||||||
|
CornerRadius="14"
|
||||||
|
HorizontalAlignment="Right"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
Margin="4,4,4,0"
|
||||||
|
Padding="0"
|
||||||
|
Background="#00000010"
|
||||||
|
BorderThickness="0"
|
||||||
|
Click="OnToggleButtonClick">
|
||||||
|
<fi:SymbolIcon x:Name="ToggleIcon"
|
||||||
|
Symbol="Edit"
|
||||||
|
IconVariant="Regular"
|
||||||
|
FontSize="13"
|
||||||
|
Foreground="#8B7D5A" />
|
||||||
|
</Button>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
</UserControl>
|
||||||
371
LanMountainDesktop/Views/Components/StickyNoteWidget.axaml.cs
Normal file
371
LanMountainDesktop/Views/Components/StickyNoteWidget.axaml.cs
Normal file
@@ -0,0 +1,371 @@
|
|||||||
|
using System;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Avalonia;
|
||||||
|
using Avalonia.Controls;
|
||||||
|
using Avalonia.Interactivity;
|
||||||
|
using Avalonia.Media;
|
||||||
|
using Avalonia.Styling;
|
||||||
|
using Avalonia.Threading;
|
||||||
|
using FluentIcons.Common;
|
||||||
|
using LanMountainDesktop.ComponentSystem;
|
||||||
|
using LanMountainDesktop.Host.Abstractions;
|
||||||
|
using LanMountainDesktop.Models;
|
||||||
|
using LanMountainDesktop.PluginSdk;
|
||||||
|
using LanMountainDesktop.Services.Settings;
|
||||||
|
|
||||||
|
namespace LanMountainDesktop.Views.Components;
|
||||||
|
|
||||||
|
public partial class StickyNoteWidget : UserControl,
|
||||||
|
IDesktopComponentWidget,
|
||||||
|
IComponentPlacementContextAware,
|
||||||
|
IComponentSettingsContextAware,
|
||||||
|
IDesktopPageVisibilityAwareComponentWidget,
|
||||||
|
IDisposable
|
||||||
|
{
|
||||||
|
private static readonly Color LightNoteYellow = Color.FromRgb(0xFF, 0xF9, 0xC4);
|
||||||
|
private static readonly Color LightNoteBorder = Color.FromRgb(0xE0, 0xC8, 0x78);
|
||||||
|
private static readonly Color LightNoteForeground = Color.FromRgb(0x5D, 0x4E, 0x37);
|
||||||
|
private static readonly Color LightNoteHint = Color.FromRgb(0x8B, 0x7D, 0x5A);
|
||||||
|
|
||||||
|
private static readonly Color DarkNoteYellow = Color.FromRgb(0x5D, 0x52, 0x29);
|
||||||
|
private static readonly Color DarkNoteBorder = Color.FromRgb(0x7A, 0x6D, 0x3A);
|
||||||
|
private static readonly Color DarkNoteForeground = Color.FromRgb(0xE8, 0xE0, 0xC8);
|
||||||
|
private static readonly Color DarkNoteHint = Color.FromRgb(0xA0, 0x96, 0x70);
|
||||||
|
|
||||||
|
private string _componentId = BuiltInComponentIds.DesktopStickyNote;
|
||||||
|
private string _placementId = string.Empty;
|
||||||
|
private IComponentSettingsAccessor? _settingsAccessor;
|
||||||
|
private string _markdownContent = string.Empty;
|
||||||
|
private bool _isEditing;
|
||||||
|
private bool _isDirty;
|
||||||
|
private bool _isOnActivePage = true;
|
||||||
|
private bool _isEditMode;
|
||||||
|
private bool _disposed;
|
||||||
|
private bool _isApplyingPersistedContent;
|
||||||
|
|
||||||
|
private readonly DispatcherTimer _autoSaveTimer = new()
|
||||||
|
{
|
||||||
|
Interval = TimeSpan.FromSeconds(30)
|
||||||
|
};
|
||||||
|
|
||||||
|
private CancellationTokenSource? _renderDebounceCts;
|
||||||
|
|
||||||
|
public StickyNoteWidget()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
|
||||||
|
_autoSaveTimer.Tick += OnAutoSaveTimerTick;
|
||||||
|
NoteTextBox.TextChanged += OnNoteTextBoxTextChanged;
|
||||||
|
AttachedToVisualTree += OnAttachedToVisualTree;
|
||||||
|
DetachedFromVisualTree += OnDetachedFromVisualTree;
|
||||||
|
|
||||||
|
ApplyNoteColors();
|
||||||
|
UpdateDisplay();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ApplyCellSize(double cellSize)
|
||||||
|
{
|
||||||
|
var scale = Math.Clamp(cellSize / 48d, 0.82, 2.2);
|
||||||
|
|
||||||
|
RootBorder.CornerRadius = new CornerRadius(
|
||||||
|
ComponentChromeCornerRadiusHelper.ResolveMainRectangleRadiusValue(
|
||||||
|
new ComponentChromeContext(
|
||||||
|
_componentId,
|
||||||
|
_placementId,
|
||||||
|
Math.Max(1, cellSize),
|
||||||
|
Appearance.AppearanceCornerRadiusTokenFactory.Create(
|
||||||
|
Settings.Core.GlobalAppearanceSettings.DefaultCornerRadiusStyle))));
|
||||||
|
|
||||||
|
RootBorder.Padding = new Thickness(
|
||||||
|
Math.Clamp(2 * scale, 1, 4),
|
||||||
|
Math.Clamp(2 * scale, 1, 4));
|
||||||
|
|
||||||
|
var contentMargin = Math.Clamp(12 * scale, 6, 20);
|
||||||
|
MarkdownViewer.Margin = new Thickness(contentMargin, contentMargin, contentMargin, contentMargin - 2);
|
||||||
|
NoteTextBox.Margin = new Thickness(contentMargin, contentMargin, contentMargin, contentMargin - 2);
|
||||||
|
NoteTextBox.FontSize = Math.Clamp(13 * scale, 10, 22);
|
||||||
|
|
||||||
|
var buttonSize = Math.Clamp(28 * scale, 22, 40);
|
||||||
|
ToggleButton.Width = buttonSize;
|
||||||
|
ToggleButton.Height = buttonSize;
|
||||||
|
ToggleButton.CornerRadius = new CornerRadius(buttonSize / 2d);
|
||||||
|
ToggleButton.Margin = new Thickness(Math.Clamp(4 * scale, 2, 8), Math.Clamp(4 * scale, 2, 8), Math.Clamp(4 * scale, 2, 8), 0);
|
||||||
|
ToggleIcon.FontSize = Math.Clamp(13 * scale, 10, 18);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetComponentPlacementContext(string componentId, string? placementId)
|
||||||
|
{
|
||||||
|
if (_isDirty && !string.IsNullOrWhiteSpace(_placementId))
|
||||||
|
{
|
||||||
|
PersistNoteImmediately();
|
||||||
|
}
|
||||||
|
|
||||||
|
_componentId = string.IsNullOrWhiteSpace(componentId)
|
||||||
|
? BuiltInComponentIds.DesktopStickyNote
|
||||||
|
: componentId.Trim();
|
||||||
|
_placementId = placementId?.Trim() ?? string.Empty;
|
||||||
|
|
||||||
|
if (_isEditing)
|
||||||
|
{
|
||||||
|
ExitEditMode();
|
||||||
|
}
|
||||||
|
|
||||||
|
LoadPersistedContent();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetComponentSettingsContext(DesktopComponentSettingsContext context)
|
||||||
|
{
|
||||||
|
_settingsAccessor = context.ComponentSettingsAccessor;
|
||||||
|
LoadPersistedContent();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetDesktopPageContext(bool isOnActivePage, bool isEditMode)
|
||||||
|
{
|
||||||
|
_isOnActivePage = isOnActivePage;
|
||||||
|
_isEditMode = isEditMode;
|
||||||
|
|
||||||
|
ToggleButton.IsHitTestVisible = !isEditMode;
|
||||||
|
NoteTextBox.IsReadOnly = isEditMode;
|
||||||
|
|
||||||
|
if (isEditMode && _isEditing)
|
||||||
|
{
|
||||||
|
ExitEditMode();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnToggleButtonClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (_isEditing)
|
||||||
|
{
|
||||||
|
ExitEditMode();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
EnterEditMode();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void EnterEditMode()
|
||||||
|
{
|
||||||
|
_isEditing = true;
|
||||||
|
|
||||||
|
NoteTextBox.Text = _markdownContent;
|
||||||
|
MarkdownViewer.IsVisible = false;
|
||||||
|
NoteTextBox.IsVisible = true;
|
||||||
|
ToggleIcon.Symbol = Symbol.Checkmark;
|
||||||
|
|
||||||
|
Dispatcher.UIThread.Post(() => NoteTextBox.Focus(), DispatcherPriority.Input);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ExitEditMode()
|
||||||
|
{
|
||||||
|
_isEditing = false;
|
||||||
|
|
||||||
|
var editedContent = NoteTextBox.Text ?? string.Empty;
|
||||||
|
if (editedContent != _markdownContent)
|
||||||
|
{
|
||||||
|
_markdownContent = editedContent;
|
||||||
|
_isDirty = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
NoteTextBox.IsVisible = false;
|
||||||
|
MarkdownViewer.IsVisible = true;
|
||||||
|
ToggleIcon.Symbol = Symbol.Edit;
|
||||||
|
|
||||||
|
UpdateDisplay();
|
||||||
|
|
||||||
|
if (_isDirty)
|
||||||
|
{
|
||||||
|
PersistNoteImmediately();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnNoteTextBoxTextChanged(object? sender, TextChangedEventArgs e)
|
||||||
|
{
|
||||||
|
if (_isApplyingPersistedContent || !_isEditing)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_isDirty = true;
|
||||||
|
|
||||||
|
if (!_autoSaveTimer.IsEnabled)
|
||||||
|
{
|
||||||
|
_autoSaveTimer.Start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnAutoSaveTimerTick(object? sender, EventArgs e)
|
||||||
|
{
|
||||||
|
_autoSaveTimer.Stop();
|
||||||
|
|
||||||
|
if (_isDirty && _isEditing)
|
||||||
|
{
|
||||||
|
_markdownContent = NoteTextBox.Text ?? string.Empty;
|
||||||
|
PersistNoteImmediately();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdateDisplay()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(_markdownContent))
|
||||||
|
{
|
||||||
|
MarkdownViewer.Markdown = "*Click ✏️ to write a note...*";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_renderDebounceCts?.Cancel();
|
||||||
|
_renderDebounceCts?.Dispose();
|
||||||
|
_renderDebounceCts = new CancellationTokenSource();
|
||||||
|
var token = _renderDebounceCts.Token;
|
||||||
|
|
||||||
|
Dispatcher.UIThread.Post(async () =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await Task.Delay(150, token);
|
||||||
|
if (!token.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
MarkdownViewer.Markdown = _markdownContent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (OperationCanceledException) { }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MarkdownViewer.Markdown = $"*Error: {ex.Message}*";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void LoadPersistedContent()
|
||||||
|
{
|
||||||
|
if (_settingsAccessor is null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var snapshot = _settingsAccessor.LoadSnapshot<ComponentSettingsSnapshot>();
|
||||||
|
_isApplyingPersistedContent = true;
|
||||||
|
_markdownContent = snapshot.StickyNoteContent ?? string.Empty;
|
||||||
|
_isDirty = false;
|
||||||
|
UpdateDisplay();
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
_markdownContent = string.Empty;
|
||||||
|
UpdateDisplay();
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
_isApplyingPersistedContent = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void PersistNoteImmediately()
|
||||||
|
{
|
||||||
|
if (_settingsAccessor is null || _disposed)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var snapshot = _settingsAccessor.LoadSnapshot<ComponentSettingsSnapshot>();
|
||||||
|
snapshot.StickyNoteContent = _markdownContent;
|
||||||
|
_settingsAccessor.SaveSnapshot(snapshot,
|
||||||
|
[nameof(ComponentSettingsSnapshot.StickyNoteContent)]);
|
||||||
|
_isDirty = false;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ApplyNoteColors()
|
||||||
|
{
|
||||||
|
var isDark = Application.Current?.ActualThemeVariant == ThemeVariant.Dark;
|
||||||
|
|
||||||
|
if (isDark)
|
||||||
|
{
|
||||||
|
RootBorder.Background = new SolidColorBrush(DarkNoteYellow);
|
||||||
|
RootBorder.BorderBrush = new SolidColorBrush(DarkNoteBorder);
|
||||||
|
NoteTextBox.Foreground = new SolidColorBrush(DarkNoteForeground);
|
||||||
|
ToggleIcon.Foreground = new SolidColorBrush(DarkNoteHint);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
RootBorder.Background = new SolidColorBrush(LightNoteYellow);
|
||||||
|
RootBorder.BorderBrush = new SolidColorBrush(LightNoteBorder);
|
||||||
|
NoteTextBox.Foreground = new SolidColorBrush(LightNoteForeground);
|
||||||
|
ToggleIcon.Foreground = new SolidColorBrush(LightNoteHint);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnAttachedToVisualTree(object? sender, VisualTreeAttachmentEventArgs e)
|
||||||
|
{
|
||||||
|
Application.Current!.ActualThemeVariantChanged += OnThemeVariantChanged;
|
||||||
|
ApplyNoteColors();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnDetachedFromVisualTree(object? sender, VisualTreeAttachmentEventArgs e)
|
||||||
|
{
|
||||||
|
Application.Current!.ActualThemeVariantChanged -= OnThemeVariantChanged;
|
||||||
|
|
||||||
|
if (_isDirty)
|
||||||
|
{
|
||||||
|
if (_isEditing)
|
||||||
|
{
|
||||||
|
_markdownContent = NoteTextBox.Text ?? string.Empty;
|
||||||
|
}
|
||||||
|
PersistNoteImmediately();
|
||||||
|
}
|
||||||
|
|
||||||
|
_autoSaveTimer.Stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnThemeVariantChanged(object? sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Dispatcher.UIThread.Post(ApplyNoteColors);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ForceSave()
|
||||||
|
{
|
||||||
|
if (_isEditing)
|
||||||
|
{
|
||||||
|
_markdownContent = NoteTextBox.Text ?? string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_isDirty || _isEditing)
|
||||||
|
{
|
||||||
|
PersistNoteImmediately();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (_disposed)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_disposed = true;
|
||||||
|
_autoSaveTimer.Stop();
|
||||||
|
_renderDebounceCts?.Cancel();
|
||||||
|
_renderDebounceCts?.Dispose();
|
||||||
|
|
||||||
|
if (_isDirty)
|
||||||
|
{
|
||||||
|
if (_isEditing)
|
||||||
|
{
|
||||||
|
_markdownContent = NoteTextBox.Text ?? string.Empty;
|
||||||
|
}
|
||||||
|
PersistNoteImmediately();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -40,13 +40,12 @@ public partial class WhiteboardWidget : UserControl, IDesktopComponentWidget, IC
|
|||||||
private WhiteboardToolMode _toolMode = WhiteboardToolMode.Pen;
|
private WhiteboardToolMode _toolMode = WhiteboardToolMode.Pen;
|
||||||
private bool? _isNightModeApplied;
|
private bool? _isNightModeApplied;
|
||||||
private SKColor _selectedInkColor = SKColors.Black;
|
private SKColor _selectedInkColor = SKColors.Black;
|
||||||
|
private bool _isUserCustomColor;
|
||||||
private float _selectedInkThickness = 2.5f;
|
private float _selectedInkThickness = 2.5f;
|
||||||
private string _componentId = BuiltInComponentIds.DesktopWhiteboard;
|
private string _componentId = BuiltInComponentIds.DesktopWhiteboard;
|
||||||
private string _placementId = string.Empty;
|
private string _placementId = string.Empty;
|
||||||
private int _noteRetentionDays = WhiteboardNoteRetentionPolicy.DefaultDays;
|
private int _noteRetentionDays = WhiteboardNoteRetentionPolicy.DefaultDays;
|
||||||
private bool _isApplyingPersistedSnapshot;
|
private bool _isApplyingPersistedSnapshot;
|
||||||
private bool? _lastBitmapCacheEnabled;
|
|
||||||
private int _lastBitmapCacheSize;
|
|
||||||
private bool _noteDirty;
|
private bool _noteDirty;
|
||||||
private int _noteLoadRevision;
|
private int _noteLoadRevision;
|
||||||
private bool _disposed;
|
private bool _disposed;
|
||||||
@@ -121,10 +120,11 @@ public partial class WhiteboardWidget : UserControl, IDesktopComponentWidget, IC
|
|||||||
settings.IgnorePressure = true;
|
settings.IgnorePressure = true;
|
||||||
settings.InkThickness = _selectedInkThickness;
|
settings.InkThickness = _selectedInkThickness;
|
||||||
settings.EraserSize = new Size(20, 20);
|
settings.EraserSize = new Size(20, 20);
|
||||||
|
settings.IsBitmapCacheEnabled = true;
|
||||||
|
settings.MaxBitmapCacheSize = 2048;
|
||||||
InkCanvas.StrokeCollected += OnInkCanvasStrokeCollected;
|
InkCanvas.StrokeCollected += OnInkCanvasStrokeCollected;
|
||||||
InkCanvas.PointerReleased += OnInkCanvasPointerReleased;
|
InkCanvas.PointerReleased += OnInkCanvasPointerReleased;
|
||||||
InkCanvas.PointerCaptureLost += OnInkCanvasPointerCaptureLost;
|
InkCanvas.PointerCaptureLost += OnInkCanvasPointerCaptureLost;
|
||||||
UpdateInkCanvasCacheSettings(forceRefresh: true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ApplyCellSize(double cellSize)
|
public void ApplyCellSize(double cellSize)
|
||||||
@@ -158,7 +158,6 @@ public partial class WhiteboardWidget : UserControl, IDesktopComponentWidget, IC
|
|||||||
var settings = InkCanvas.AvaloniaSkiaInkCanvas.Settings;
|
var settings = InkCanvas.AvaloniaSkiaInkCanvas.Settings;
|
||||||
var eraserSize = Math.Clamp(_currentCellSize * 0.42, 12, 44);
|
var eraserSize = Math.Clamp(_currentCellSize * 0.42, 12, 44);
|
||||||
settings.EraserSize = new Size(eraserSize, eraserSize);
|
settings.EraserSize = new Size(eraserSize, eraserSize);
|
||||||
UpdateInkCanvasCacheSettings(forceRefresh: false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ApplyThemeVisual(bool force)
|
private void ApplyThemeVisual(bool force)
|
||||||
@@ -169,6 +168,7 @@ public partial class WhiteboardWidget : UserControl, IDesktopComponentWidget, IC
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var wasNightMode = _isNightModeApplied;
|
||||||
_isNightModeApplied = isNightMode;
|
_isNightModeApplied = isNightMode;
|
||||||
|
|
||||||
RootBorder.Background = new SolidColorBrush(isNightMode ? Color.Parse("#FF181B22") : Color.Parse("#FFF1F4F9"));
|
RootBorder.Background = new SolidColorBrush(isNightMode ? Color.Parse("#FF181B22") : Color.Parse("#FFF1F4F9"));
|
||||||
@@ -177,9 +177,39 @@ public partial class WhiteboardWidget : UserControl, IDesktopComponentWidget, IC
|
|||||||
ToolbarBorder.Background = new SolidColorBrush(isNightMode ? Color.Parse("#1AFFFFFF") : Color.Parse("#E6FFFFFF"));
|
ToolbarBorder.Background = new SolidColorBrush(isNightMode ? Color.Parse("#1AFFFFFF") : Color.Parse("#E6FFFFFF"));
|
||||||
ToolbarBorder.BorderBrush = new SolidColorBrush(isNightMode ? Color.Parse("#26FFFFFF") : Color.Parse("#16000000"));
|
ToolbarBorder.BorderBrush = new SolidColorBrush(isNightMode ? Color.Parse("#26FFFFFF") : Color.Parse("#16000000"));
|
||||||
|
|
||||||
|
ApplyThemeDefaultInkColor(isNightMode, wasNightMode);
|
||||||
RefreshToolButtonVisuals();
|
RefreshToolButtonVisuals();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ApplyThemeDefaultInkColor(bool isNightMode, bool? wasNightMode)
|
||||||
|
{
|
||||||
|
if (_isUserCustomColor || wasNightMode == isNightMode)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var oldDefault = wasNightMode == true ? SKColors.White : SKColors.Black;
|
||||||
|
var newDefault = isNightMode ? SKColors.White : SKColors.Black;
|
||||||
|
|
||||||
|
if (_selectedInkColor == oldDefault)
|
||||||
|
{
|
||||||
|
_selectedInkColor = newDefault;
|
||||||
|
if (_toolMode == WhiteboardToolMode.Pen)
|
||||||
|
{
|
||||||
|
InkCanvas.AvaloniaSkiaInkCanvas.Settings.InkColor = _selectedInkColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (InkColorPicker is not null)
|
||||||
|
{
|
||||||
|
InkColorPicker.Color = new Color(
|
||||||
|
_selectedInkColor.Alpha,
|
||||||
|
_selectedInkColor.Red,
|
||||||
|
_selectedInkColor.Green,
|
||||||
|
_selectedInkColor.Blue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void SetComponentPlacementContext(string componentId, string? placementId)
|
public void SetComponentPlacementContext(string componentId, string? placementId)
|
||||||
{
|
{
|
||||||
var nextComponentId = string.IsNullOrWhiteSpace(componentId)
|
var nextComponentId = string.IsNullOrWhiteSpace(componentId)
|
||||||
@@ -431,7 +461,9 @@ public partial class WhiteboardWidget : UserControl, IDesktopComponentWidget, IC
|
|||||||
private void OnColorPickerColorChanged(object? sender, ColorChangedEventArgs e)
|
private void OnColorPickerColorChanged(object? sender, ColorChangedEventArgs e)
|
||||||
{
|
{
|
||||||
var color = e.NewColor;
|
var color = e.NewColor;
|
||||||
SetInkColor(new SKColor(color.R, color.G, color.B, color.A));
|
var skColor = new SKColor(color.R, color.G, color.B, color.A);
|
||||||
|
_isUserCustomColor = skColor != SKColors.Black && skColor != SKColors.White;
|
||||||
|
SetInkColor(skColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnInkThicknessSliderValueChanged(object? sender, RangeBaseValueChangedEventArgs e)
|
private void OnInkThicknessSliderValueChanged(object? sender, RangeBaseValueChangedEventArgs e)
|
||||||
@@ -713,7 +745,8 @@ public partial class WhiteboardWidget : UserControl, IDesktopComponentWidget, IC
|
|||||||
InkCanvas.AvaloniaSkiaInkCanvas.AddStaticStroke(staticStroke);
|
InkCanvas.AvaloniaSkiaInkCanvas.AddStaticStroke(staticStroke);
|
||||||
}
|
}
|
||||||
|
|
||||||
UpdateInkCanvasCacheSettings(forceRefresh: true);
|
InkCanvas.AvaloniaSkiaInkCanvas.UpdateBitmapCache();
|
||||||
|
InkCanvas.InvalidateVisual();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static InkStylusPoint ConvertStylusPoint(WhiteboardStylusPointSnapshot point)
|
private static InkStylusPoint ConvertStylusPoint(WhiteboardStylusPointSnapshot point)
|
||||||
@@ -766,7 +799,9 @@ public partial class WhiteboardWidget : UserControl, IDesktopComponentWidget, IC
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
UpdateInkCanvasCacheSettings(forceRefresh: true);
|
InkCanvas.AvaloniaSkiaInkCanvas.UseBitmapCache(false);
|
||||||
|
InkCanvas.AvaloniaSkiaInkCanvas.InvalidateBitmapCache();
|
||||||
|
InkCanvas.InvalidateVisual();
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool HasValidPersistenceContext()
|
private bool HasValidPersistenceContext()
|
||||||
@@ -784,47 +819,4 @@ public partial class WhiteboardWidget : UserControl, IDesktopComponentWidget, IC
|
|||||||
|
|
||||||
return Array.Empty<InkStylusPoint>();
|
return Array.Empty<InkStylusPoint>();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateInkCanvasCacheSettings(bool forceRefresh)
|
|
||||||
{
|
|
||||||
var renderScaling = TopLevel.GetTopLevel(this)?.RenderScaling ?? 1d;
|
|
||||||
var widthPx = Math.Max(1d, CanvasBorder.Bounds.Width * renderScaling);
|
|
||||||
var heightPx = Math.Max(1d, CanvasBorder.Bounds.Height * renderScaling);
|
|
||||||
var longestSide = Math.Max(widthPx, heightPx);
|
|
||||||
var area = widthPx * heightPx;
|
|
||||||
|
|
||||||
var cacheEnabled = longestSide <= 1536d && area <= 1_400_000d;
|
|
||||||
var cacheSize = (int)Math.Clamp(Math.Ceiling(longestSide), 384d, 1536d);
|
|
||||||
if (!forceRefresh &&
|
|
||||||
_lastBitmapCacheEnabled == cacheEnabled &&
|
|
||||||
_lastBitmapCacheSize == cacheSize)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_lastBitmapCacheEnabled = cacheEnabled;
|
|
||||||
_lastBitmapCacheSize = cacheSize;
|
|
||||||
|
|
||||||
var settings = InkCanvas.AvaloniaSkiaInkCanvas.Settings;
|
|
||||||
settings.IsBitmapCacheEnabled = cacheEnabled;
|
|
||||||
settings.MaxBitmapCacheSize = cacheSize;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
InkCanvas.AvaloniaSkiaInkCanvas.UseBitmapCache(cacheEnabled);
|
|
||||||
if (cacheEnabled)
|
|
||||||
{
|
|
||||||
InkCanvas.AvaloniaSkiaInkCanvas.UpdateBitmapCache();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
InkCanvas.AvaloniaSkiaInkCanvas.InvalidateBitmapCache();
|
|
||||||
InkCanvas.InvalidateVisual();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
// Keep drawing available even if the underlying cache backend rejects the cache update.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,160 +1,227 @@
|
|||||||
<UserControl xmlns="https://github.com/avaloniaui"
|
<UserControl xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:vm="using:LanMountainDesktop.ViewModels"
|
xmlns:vm="using:LanMountainDesktop.ViewModels"
|
||||||
xmlns:fi="using:FluentIcons.Avalonia"
|
xmlns:ui="using:FluentAvalonia.UI.Controls"
|
||||||
|
xmlns:fi="using:FluentIcons.Avalonia.Fluent"
|
||||||
|
xmlns:converters="using:Avalonia.Data.Converters"
|
||||||
x:Class="LanMountainDesktop.Views.FusedDesktopComponentLibraryControl"
|
x:Class="LanMountainDesktop.Views.FusedDesktopComponentLibraryControl"
|
||||||
x:DataType="vm:ComponentLibraryWindowViewModel">
|
x:DataType="vm:ComponentLibraryWindowViewModel">
|
||||||
|
|
||||||
<Grid ColumnDefinitions="240,*"
|
<UserControl.Styles>
|
||||||
ColumnSpacing="12"
|
<!-- 分类列表项样式 - 遵循 Fluent NavigationView 风格 -->
|
||||||
|
<Style Selector="ListBoxItem.category-item">
|
||||||
|
<Setter Property="Padding" Value="0"/>
|
||||||
|
<Setter Property="Margin" Value="0,2"/>
|
||||||
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
|
<Setter Property="CornerRadius" Value="{DynamicResource DesignCornerRadiusSm}"/>
|
||||||
|
<Setter Property="Transitions">
|
||||||
|
<Transitions>
|
||||||
|
<BrushTransition Property="Background" Duration="0:0:0.083" Easing="0.05,0.75,0.10,1.00"/>
|
||||||
|
</Transitions>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="ListBoxItem.category-item:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
||||||
|
<Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}"/>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="ListBoxItem.category-item:selected /template/ ContentPresenter#PART_ContentPresenter">
|
||||||
|
<Setter Property="Background" Value="{DynamicResource AdaptiveNavItemSelectedBackgroundBrush}"/>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="ListBoxItem.category-item:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
||||||
|
<Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<!-- 分类项图标和文字 -->
|
||||||
|
<Style Selector="ListBoxItem.category-item fi|FluentIcon.category-icon">
|
||||||
|
<Setter Property="Foreground" Value="{DynamicResource AdaptiveTextPrimaryBrush}"/>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="ListBoxItem.category-item:selected fi|FluentIcon.category-icon">
|
||||||
|
<Setter Property="Foreground" Value="{DynamicResource AdaptiveTextPrimaryBrush}"/>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<Style Selector="ListBoxItem.category-item TextBlock.category-text">
|
||||||
|
<Setter Property="Foreground" Value="{DynamicResource AdaptiveTextPrimaryBrush}"/>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="ListBoxItem.category-item:selected TextBlock.category-text">
|
||||||
|
<Setter Property="Foreground" Value="{DynamicResource AdaptiveTextPrimaryBrush}"/>
|
||||||
|
<Setter Property="FontWeight" Value="SemiBold"/>
|
||||||
|
</Style>
|
||||||
|
</UserControl.Styles>
|
||||||
|
|
||||||
|
<Grid ColumnDefinitions="Auto,*"
|
||||||
|
ColumnSpacing="0"
|
||||||
Margin="0">
|
Margin="0">
|
||||||
<!-- 分类列表 (左侧) -->
|
<!-- 左侧导航列 - 分类列表 + 底部"查找更多组件" -->
|
||||||
<Border Classes="surface-translucent-panel"
|
<Border Width="280"
|
||||||
CornerRadius="{DynamicResource DesignCornerRadiusLg}"
|
Background="Transparent">
|
||||||
Padding="10">
|
<Grid RowDefinitions="*,Auto">
|
||||||
<Grid RowDefinitions="Auto,*">
|
<!-- 分类列表 -->
|
||||||
<TextBox x:Name="SearchBox"
|
|
||||||
Watermark="搜索组件..."
|
|
||||||
Margin="0,0,0,12"
|
|
||||||
Classes="clear"
|
|
||||||
Background="{DynamicResource AdaptiveSurfaceLowBrush}"
|
|
||||||
CornerRadius="12"
|
|
||||||
Padding="12,8">
|
|
||||||
<TextBox.InnerLeftContent>
|
|
||||||
<fi:SymbolIcon Symbol="Search" FontSize="16" Margin="10,0,0,0" Opacity="0.5" />
|
|
||||||
</TextBox.InnerLeftContent>
|
|
||||||
</TextBox>
|
|
||||||
|
|
||||||
<ListBox x:Name="CategoryListBox"
|
<ListBox x:Name="CategoryListBox"
|
||||||
Grid.Row="1"
|
Grid.Row="0"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
|
Margin="8,8,4,0"
|
||||||
SelectionChanged="OnCategorySelectionChanged"
|
SelectionChanged="OnCategorySelectionChanged"
|
||||||
ItemsSource="{Binding Categories}">
|
ItemsSource="{Binding Categories}">
|
||||||
<ListBox.ItemTemplate>
|
<ListBox.ItemTemplate>
|
||||||
<DataTemplate x:DataType="vm:ComponentLibraryCategoryViewModel">
|
<DataTemplate x:DataType="vm:ComponentLibraryCategoryViewModel">
|
||||||
<Border Padding="10"
|
<Grid ColumnDefinitions="Auto,*"
|
||||||
Margin="0,0,0,6"
|
ColumnSpacing="12"
|
||||||
CornerRadius="{DynamicResource DesignCornerRadiusSm}"
|
Margin="12,10">
|
||||||
Background="{DynamicResource AdaptiveNavItemBackgroundBrush}">
|
<fi:FluentIcon Icon="{Binding Icon}"
|
||||||
<Grid ColumnDefinitions="Auto,*"
|
IconVariant="Regular"
|
||||||
ColumnSpacing="8">
|
FontSize="18"
|
||||||
<fi:SymbolIcon Symbol="{Binding Icon}"
|
Classes="category-icon"/>
|
||||||
IconVariant="Regular"
|
<TextBlock Grid.Column="1"
|
||||||
FontSize="16" />
|
VerticalAlignment="Center"
|
||||||
<TextBlock Grid.Column="1"
|
FontSize="14"
|
||||||
VerticalAlignment="Center"
|
Classes="category-text"
|
||||||
FontWeight="SemiBold"
|
Text="{Binding Title}"/>
|
||||||
Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
|
</Grid>
|
||||||
Text="{Binding Title}" />
|
|
||||||
</Grid>
|
|
||||||
</Border>
|
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ListBox.ItemTemplate>
|
</ListBox.ItemTemplate>
|
||||||
</ListBox>
|
</ListBox>
|
||||||
|
|
||||||
|
<!-- 底部"查找更多组件" - 在左侧导航列底部 -->
|
||||||
|
<StackPanel Grid.Row="1"
|
||||||
|
Margin="12,8,8,12">
|
||||||
|
<Border Height="1"
|
||||||
|
Background="{DynamicResource AdaptiveGlassPanelBorderBrush}"
|
||||||
|
Opacity="0.4"
|
||||||
|
Margin="0,0,0,8"/>
|
||||||
|
<Button Classes="hyperlink"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
Click="OnFindMoreComponentsClick">
|
||||||
|
<StackPanel Orientation="Horizontal" Spacing="6">
|
||||||
|
<fi:FluentIcon Icon="Globe" IconVariant="Regular" FontSize="14"/>
|
||||||
|
<TextBlock Text="查找更多组件"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Button>
|
||||||
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<!-- 组件网格 (右侧) -->
|
<!-- 右侧内容区与左侧的分隔线 -->
|
||||||
<Border Grid.Column="1"
|
<Border Grid.Column="1"
|
||||||
Classes="surface-translucent-strong"
|
Width="1"
|
||||||
CornerRadius="{DynamicResource DesignCornerRadiusLg}"
|
HorizontalAlignment="Left"
|
||||||
Padding="10">
|
Background="{DynamicResource AdaptiveGlassPanelBorderBrush}"
|
||||||
<ScrollViewer VerticalScrollBarVisibility="Auto"
|
Opacity="0.5"/>
|
||||||
HorizontalScrollBarVisibility="Disabled">
|
|
||||||
<ItemsControl x:Name="ComponentItemsControl"
|
|
||||||
ItemsSource="{Binding Components}">
|
|
||||||
<ItemsControl.ItemsPanel>
|
|
||||||
<ItemsPanelTemplate>
|
|
||||||
<WrapPanel Orientation="Horizontal" />
|
|
||||||
</ItemsPanelTemplate>
|
|
||||||
</ItemsControl.ItemsPanel>
|
|
||||||
|
|
||||||
<ItemsControl.ItemTemplate>
|
<!-- 组件预览区 (右侧) -->
|
||||||
<DataTemplate x:DataType="vm:ComponentLibraryItemViewModel">
|
<ScrollViewer Grid.Column="1"
|
||||||
<Border Width="240"
|
VerticalScrollBarVisibility="Auto"
|
||||||
Height="220"
|
HorizontalScrollBarVisibility="Disabled">
|
||||||
Margin="6"
|
<StackPanel Margin="16,8,12,8"
|
||||||
CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
|
Spacing="0">
|
||||||
Padding="10"
|
|
||||||
Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
|
|
||||||
BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
|
|
||||||
BorderThickness="1">
|
|
||||||
<Grid RowDefinitions="*,Auto,Auto"
|
|
||||||
RowSpacing="8">
|
|
||||||
<!-- 预览区域 -->
|
|
||||||
<Border CornerRadius="{DynamicResource DesignCornerRadiusSm}"
|
|
||||||
Background="{DynamicResource AdaptiveGlassPanelBackgroundBrush}"
|
|
||||||
BorderThickness="1"
|
|
||||||
BorderBrush="{DynamicResource AdaptiveGlassPanelBorderBrush}"
|
|
||||||
Padding="8">
|
|
||||||
<Grid>
|
|
||||||
<Image Source="{Binding PreviewBitmap}"
|
|
||||||
Stretch="Uniform"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
RenderOptions.BitmapInterpolationMode="HighQuality"
|
|
||||||
IsVisible="{Binding IsPreviewReady}" />
|
|
||||||
|
|
||||||
<!-- 加载中状态 -->
|
<!-- 有选中组件时的显示 -->
|
||||||
<Border IsVisible="{Binding IsPreviewPending}"
|
<Panel IsVisible="{Binding SelectedComponent, Converter={x:Static converters:ObjectConverters.IsNotNull}}">
|
||||||
Background="{DynamicResource AdaptiveSurfaceBaseBrush}">
|
|
||||||
<StackPanel HorizontalAlignment="Center"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Spacing="8">
|
|
||||||
<ProgressBar Width="96"
|
|
||||||
IsIndeterminate="True" />
|
|
||||||
<TextBlock HorizontalAlignment="Center"
|
|
||||||
TextAlignment="Center"
|
|
||||||
FontSize="12"
|
|
||||||
Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
|
|
||||||
Text="{Binding PreviewStatusText}" />
|
|
||||||
</StackPanel>
|
|
||||||
</Border>
|
|
||||||
|
|
||||||
<!-- 失败状态 -->
|
<!-- 组件展示面板 - 有独立背景色,与窗口背景形成层级分界 -->
|
||||||
<Border IsVisible="{Binding IsPreviewFailed}"
|
<Border Classes="surface-translucent-panel"
|
||||||
Background="{DynamicResource AdaptiveSurfaceBaseBrush}">
|
CornerRadius="{DynamicResource DesignCornerRadiusLg}"
|
||||||
<StackPanel HorizontalAlignment="Center"
|
Padding="20">
|
||||||
VerticalAlignment="Center"
|
<StackPanel Spacing="16">
|
||||||
Spacing="8">
|
<!-- 组件标题 -->
|
||||||
<TextBlock HorizontalAlignment="Center"
|
<TextBlock FontSize="28"
|
||||||
TextAlignment="Center"
|
FontWeight="SemiBold"
|
||||||
FontWeight="SemiBold"
|
Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
|
||||||
Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
|
Text="{Binding SelectedComponent.DisplayName}"/>
|
||||||
Text="{Binding PreviewStatusText}" />
|
|
||||||
<TextBlock HorizontalAlignment="Center"
|
<!-- 固定大小的预览卡片 -->
|
||||||
TextAlignment="Center"
|
<Border CornerRadius="{DynamicResource DesignCornerRadiusSm}"
|
||||||
FontSize="12"
|
Background="{DynamicResource AdaptiveSurfaceBaseBrush}"
|
||||||
TextWrapping="Wrap"
|
BorderBrush="{DynamicResource AdaptiveGlassPanelBorderBrush}"
|
||||||
Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
|
BorderThickness="1"
|
||||||
Text="{Binding PreviewErrorMessage}" />
|
Width="420"
|
||||||
</StackPanel>
|
Height="300"
|
||||||
</Border>
|
HorizontalAlignment="Center">
|
||||||
</Grid>
|
<Grid Margin="16">
|
||||||
|
<!-- 预览图片 -->
|
||||||
|
<Image Source="{Binding SelectedComponent.PreviewBitmap}"
|
||||||
|
Stretch="Uniform"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
RenderOptions.BitmapInterpolationMode="HighQuality"
|
||||||
|
IsVisible="{Binding SelectedComponent.IsPreviewReady}"/>
|
||||||
|
|
||||||
|
<!-- 加载中状态 -->
|
||||||
|
<Border IsVisible="{Binding SelectedComponent.IsPreviewPending}"
|
||||||
|
Background="{DynamicResource AdaptiveSurfaceBaseBrush}">
|
||||||
|
<StackPanel HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Spacing="12">
|
||||||
|
<ProgressBar Width="120"
|
||||||
|
IsIndeterminate="True"/>
|
||||||
|
<TextBlock HorizontalAlignment="Center"
|
||||||
|
TextAlignment="Center"
|
||||||
|
FontSize="14"
|
||||||
|
Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
|
||||||
|
Text="{Binding SelectedComponent.PreviewStatusText}"/>
|
||||||
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<!-- 组件名称 -->
|
<!-- 失败状态 -->
|
||||||
<TextBlock Grid.Row="1"
|
<Border IsVisible="{Binding SelectedComponent.IsPreviewFailed}"
|
||||||
HorizontalAlignment="Center"
|
Background="{DynamicResource AdaptiveSurfaceBaseBrush}">
|
||||||
FontWeight="SemiBold"
|
<StackPanel HorizontalAlignment="Center"
|
||||||
Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
|
VerticalAlignment="Center"
|
||||||
Text="{Binding DisplayName}" />
|
Spacing="8">
|
||||||
|
<fi:FluentIcon Icon="ImageOff"
|
||||||
<!-- 添加按钮 -->
|
IconVariant="Regular"
|
||||||
<Button Grid.Row="2"
|
FontSize="48"
|
||||||
HorizontalAlignment="Center"
|
Opacity="0.5"
|
||||||
Padding="12,6"
|
Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"/>
|
||||||
Tag="{Binding ComponentId}"
|
<TextBlock HorizontalAlignment="Center"
|
||||||
Click="OnAddComponentClick">
|
TextAlignment="Center"
|
||||||
<TextBlock Text="添加到桌面" />
|
FontWeight="SemiBold"
|
||||||
</Button>
|
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>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</DataTemplate>
|
|
||||||
</ItemsControl.ItemTemplate>
|
<!-- "添加小组件"按钮 - 在面板内居中,使用主题强调色 -->
|
||||||
</ItemsControl>
|
<Button HorizontalAlignment="Center"
|
||||||
</ScrollViewer>
|
Classes="accent"
|
||||||
</Border>
|
Padding="24,10"
|
||||||
|
Tag="{Binding SelectedComponent.ComponentId}"
|
||||||
|
Click="OnAddComponentClick">
|
||||||
|
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||||
|
<fi:FluentIcon Icon="Add" IconVariant="Regular" FontSize="16"/>
|
||||||
|
<TextBlock Text="添加小组件" FontWeight="SemiBold"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Button>
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
</Panel>
|
||||||
|
|
||||||
|
<!-- 空状态 -->
|
||||||
|
<Grid IsVisible="{Binding SelectedComponent, Converter={x:Static converters:ObjectConverters.IsNull}}"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
MinHeight="400">
|
||||||
|
<StackPanel Spacing="16" HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center">
|
||||||
|
<fi:FluentIcon Icon="Apps"
|
||||||
|
IconVariant="Regular"
|
||||||
|
FontSize="64"
|
||||||
|
Opacity="0.3"
|
||||||
|
Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"/>
|
||||||
|
<TextBlock HorizontalAlignment="Center"
|
||||||
|
FontSize="16"
|
||||||
|
Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
|
||||||
|
Text="请从左侧选择一个组件"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
</StackPanel>
|
||||||
|
</ScrollViewer>
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using System.Linq;
|
|||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Interactivity;
|
using Avalonia.Interactivity;
|
||||||
|
using Avalonia.VisualTree;
|
||||||
using FluentIcons.Common;
|
using FluentIcons.Common;
|
||||||
using LanMountainDesktop.ComponentSystem;
|
using LanMountainDesktop.ComponentSystem;
|
||||||
using LanMountainDesktop.Services;
|
using LanMountainDesktop.Services;
|
||||||
@@ -29,6 +30,8 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
|
|||||||
private readonly IRecommendationInfoService _recommendationInfoService = new RecommendationDataService();
|
private readonly IRecommendationInfoService _recommendationInfoService = new RecommendationDataService();
|
||||||
private readonly ICalculatorDataService _calculatorDataService = new CalculatorDataService();
|
private readonly ICalculatorDataService _calculatorDataService = new CalculatorDataService();
|
||||||
|
|
||||||
|
private static readonly LocalizationService _localizationService = new();
|
||||||
|
|
||||||
public FusedDesktopComponentLibraryControl()
|
public FusedDesktopComponentLibraryControl()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
@@ -39,7 +42,9 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
|
|||||||
|
|
||||||
LoadRegistry();
|
LoadRegistry();
|
||||||
LoadCategories();
|
LoadCategories();
|
||||||
SearchBox.KeyUp += (s, e) => FilterComponents();
|
|
||||||
|
// 为 ListBoxItem 添加 category-item 样式类
|
||||||
|
CategoryListBox.ContainerPrepared += OnCategoryListBoxContainerPrepared;
|
||||||
|
|
||||||
// 默认选择第一个分类
|
// 默认选择第一个分类
|
||||||
if (_viewModel.Categories.Count > 0)
|
if (_viewModel.Categories.Count > 0)
|
||||||
@@ -48,6 +53,14 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnCategoryListBoxContainerPrepared(object? sender, ContainerPreparedEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.Container is ListBoxItem listBoxItem)
|
||||||
|
{
|
||||||
|
listBoxItem.Classes.Add("category-item");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void LoadRegistry()
|
private void LoadRegistry()
|
||||||
{
|
{
|
||||||
var pluginRuntimeService = (Application.Current as App)?.PluginRuntimeService;
|
var pluginRuntimeService = (Application.Current as App)?.PluginRuntimeService;
|
||||||
@@ -65,28 +78,16 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
|
|||||||
private void LoadCategories()
|
private void LoadCategories()
|
||||||
{
|
{
|
||||||
_viewModel.Categories.Clear();
|
_viewModel.Categories.Clear();
|
||||||
_viewModel.Components.Clear();
|
|
||||||
|
var languageCode = _settingsFacade.Region.Get().LanguageCode;
|
||||||
|
|
||||||
// 添加"全部组件"分类
|
// 添加"全部组件"分类
|
||||||
_viewModel.Categories.Add(new ComponentLibraryCategoryViewModel(
|
_viewModel.Categories.Add(new ComponentLibraryCategoryViewModel(
|
||||||
"all",
|
"all",
|
||||||
"全部组件",
|
L(languageCode, "component_category.all", "All"),
|
||||||
Symbol.Apps,
|
Symbol.Apps,
|
||||||
Array.Empty<ComponentLibraryItemViewModel>()));
|
Array.Empty<ComponentLibraryItemViewModel>()));
|
||||||
|
|
||||||
var categoryMap = new Dictionary<string, (string Display, Symbol Icon)>
|
|
||||||
{
|
|
||||||
{ "clock", ("时钟", Symbol.Clock) },
|
|
||||||
{ "date", ("日历", Symbol.CalendarDate) },
|
|
||||||
{ "weather", ("天气", Symbol.WeatherSunny) },
|
|
||||||
{ "board", ("画板", Symbol.Edit) },
|
|
||||||
{ "media", ("媒体", Symbol.Play) },
|
|
||||||
{ "info", ("资讯", Symbol.News) },
|
|
||||||
{ "calculator", ("工具", Symbol.Calculator) },
|
|
||||||
{ "study", ("学习", Symbol.Hourglass) },
|
|
||||||
{ "file", ("文件", Symbol.Folder) }
|
|
||||||
};
|
|
||||||
|
|
||||||
var usedCategories = _allDefinitions
|
var usedCategories = _allDefinitions
|
||||||
.Select(d => d.Category)
|
.Select(d => d.Category)
|
||||||
.Distinct()
|
.Distinct()
|
||||||
@@ -94,23 +95,62 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
|
|||||||
|
|
||||||
foreach (var cat in usedCategories)
|
foreach (var cat in usedCategories)
|
||||||
{
|
{
|
||||||
if (categoryMap.TryGetValue(cat.ToLower(), out var info))
|
var icon = ResolveCategoryIcon(cat);
|
||||||
{
|
var title = GetLocalizedCategoryTitle(languageCode, cat);
|
||||||
var categoryComponents = _allDefinitions
|
|
||||||
.Where(d => string.Equals(d.Category, cat, StringComparison.OrdinalIgnoreCase))
|
|
||||||
.OrderBy(d => d.DisplayName)
|
|
||||||
.Select(d => CreateComponentItem(d))
|
|
||||||
.ToArray();
|
|
||||||
|
|
||||||
_viewModel.Categories.Add(new ComponentLibraryCategoryViewModel(
|
var categoryComponents = _allDefinitions
|
||||||
cat,
|
.Where(d => string.Equals(d.Category, cat, StringComparison.OrdinalIgnoreCase))
|
||||||
info.Display,
|
.OrderBy(d => d.DisplayName)
|
||||||
info.Icon,
|
.Select(d => CreateComponentItem(d))
|
||||||
categoryComponents));
|
.ToArray();
|
||||||
}
|
|
||||||
|
_viewModel.Categories.Add(new ComponentLibraryCategoryViewModel(
|
||||||
|
cat,
|
||||||
|
title,
|
||||||
|
icon,
|
||||||
|
categoryComponents));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 分类图标映射 - 与阑山桌面 Dock 栏组件库 (MainWindow.ComponentSystem) 保持一致
|
||||||
|
/// </summary>
|
||||||
|
private static Symbol ResolveCategoryIcon(string categoryId)
|
||||||
|
{
|
||||||
|
if (string.Equals(categoryId, "Clock", StringComparison.OrdinalIgnoreCase)) return Symbol.Clock;
|
||||||
|
if (string.Equals(categoryId, "Date", StringComparison.OrdinalIgnoreCase)) return Symbol.CalendarDate;
|
||||||
|
if (string.Equals(categoryId, "Weather", StringComparison.OrdinalIgnoreCase)) return Symbol.WeatherSunny;
|
||||||
|
if (string.Equals(categoryId, "Board", StringComparison.OrdinalIgnoreCase)) return Symbol.Edit;
|
||||||
|
if (string.Equals(categoryId, "Media", StringComparison.OrdinalIgnoreCase)) return Symbol.Play;
|
||||||
|
if (string.Equals(categoryId, "Info", StringComparison.OrdinalIgnoreCase)) return Symbol.Apps;
|
||||||
|
if (string.Equals(categoryId, "Calculator", StringComparison.OrdinalIgnoreCase)) return Symbol.Calculator;
|
||||||
|
if (string.Equals(categoryId, "Study", StringComparison.OrdinalIgnoreCase)) return Symbol.Hourglass;
|
||||||
|
if (string.Equals(categoryId, "File", StringComparison.OrdinalIgnoreCase)) return Symbol.Folder;
|
||||||
|
return Symbol.Apps;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 分类本地化标题 - 与阑山桌面 Dock 栏组件库 (MainWindow.ComponentSystem) 保持一致
|
||||||
|
/// </summary>
|
||||||
|
private string GetLocalizedCategoryTitle(string languageCode, string categoryId)
|
||||||
|
{
|
||||||
|
if (string.Equals(categoryId, "Clock", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.clock", "Clock");
|
||||||
|
if (string.Equals(categoryId, "Date", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.date", "Calendar");
|
||||||
|
if (string.Equals(categoryId, "Weather", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.weather", "Weather");
|
||||||
|
if (string.Equals(categoryId, "Board", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.board", "Board");
|
||||||
|
if (string.Equals(categoryId, "Media", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.media", "Media");
|
||||||
|
if (string.Equals(categoryId, "Info", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.info", "Info");
|
||||||
|
if (string.Equals(categoryId, "Calculator", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.calculator", "Calculator");
|
||||||
|
if (string.Equals(categoryId, "Study", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.study", "Study");
|
||||||
|
if (string.Equals(categoryId, "File", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.file", "File");
|
||||||
|
return categoryId;
|
||||||
|
}
|
||||||
|
|
||||||
|
private string L(string languageCode, string key, string fallback)
|
||||||
|
{
|
||||||
|
return _localizationService.GetString(languageCode, key, fallback);
|
||||||
|
}
|
||||||
|
|
||||||
private ComponentLibraryItemViewModel CreateComponentItem(DesktopComponentDefinition definition)
|
private ComponentLibraryItemViewModel CreateComponentItem(DesktopComponentDefinition definition)
|
||||||
{
|
{
|
||||||
var previewKey = ComponentPreviewKey.ForComponentType(
|
var previewKey = ComponentPreviewKey.ForComponentType(
|
||||||
@@ -130,10 +170,11 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
|
|||||||
definition.Id,
|
definition.Id,
|
||||||
definition.DisplayName,
|
definition.DisplayName,
|
||||||
previewKey,
|
previewKey,
|
||||||
|
description: null,
|
||||||
"正在加载预览...",
|
"正在加载预览...",
|
||||||
"预览不可用",
|
"预览不可用",
|
||||||
previewEntry);
|
previewEntry);
|
||||||
|
|
||||||
if (mainWindow is not null && (previewEntry is null || previewEntry.State == ComponentPreviewImageState.Pending))
|
if (mainWindow is not null && (previewEntry is null || previewEntry.State == ComponentPreviewImageState.Pending))
|
||||||
{
|
{
|
||||||
mainWindow.RequestDetachedLibraryPreview(previewKey);
|
mainWindow.RequestDetachedLibraryPreview(previewKey);
|
||||||
@@ -158,25 +199,49 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
|
|||||||
|
|
||||||
private void OnCategorySelectionChanged(object? sender, SelectionChangedEventArgs e)
|
private void OnCategorySelectionChanged(object? sender, SelectionChangedEventArgs e)
|
||||||
{
|
{
|
||||||
FilterComponents();
|
UpdateSelectedComponent();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void FilterComponents()
|
private void UpdateSelectedComponent()
|
||||||
{
|
{
|
||||||
var selectedCategory = (CategoryListBox.SelectedItem as ComponentLibraryCategoryViewModel)?.Id;
|
var selectedCategory = CategoryListBox.SelectedItem as ComponentLibraryCategoryViewModel;
|
||||||
var searchText = SearchBox.Text?.ToLower() ?? "";
|
if (selectedCategory is null)
|
||||||
|
|
||||||
var filtered = _allDefinitions.Where(d =>
|
|
||||||
{
|
{
|
||||||
var matchesCategory = selectedCategory == "all" || string.Equals(d.Category, selectedCategory, StringComparison.OrdinalIgnoreCase);
|
_viewModel.SelectedComponent = null;
|
||||||
var matchesSearch = string.IsNullOrEmpty(searchText) || d.DisplayName.ToLower().Contains(searchText) || d.Id.ToLower().Contains(searchText);
|
return;
|
||||||
return matchesCategory && matchesSearch;
|
}
|
||||||
});
|
|
||||||
|
|
||||||
_viewModel.Components.Clear();
|
// 获取该分类下的组件列表
|
||||||
foreach (var def in filtered)
|
IEnumerable<DesktopComponentDefinition> filtered;
|
||||||
|
if (selectedCategory.Id == "all")
|
||||||
{
|
{
|
||||||
_viewModel.Components.Add(CreateComponentItem(def));
|
filtered = _allDefinitions.OrderBy(d => d.DisplayName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
filtered = _allDefinitions
|
||||||
|
.Where(d => string.Equals(d.Category, selectedCategory.Id, StringComparison.OrdinalIgnoreCase))
|
||||||
|
.OrderBy(d => d.DisplayName);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 选择该分类下的第一个组件作为默认选中
|
||||||
|
var firstComponent = filtered.FirstOrDefault();
|
||||||
|
if (firstComponent is not null)
|
||||||
|
{
|
||||||
|
// 查找或创建对应的 ViewModel
|
||||||
|
var existingComponent = selectedCategory.Components.FirstOrDefault(c => c.ComponentId == firstComponent.Id);
|
||||||
|
if (existingComponent is not null)
|
||||||
|
{
|
||||||
|
_viewModel.SelectedComponent = existingComponent;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_viewModel.SelectedComponent = CreateComponentItem(firstComponent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_viewModel.SelectedComponent = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -187,4 +252,22 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
|
|||||||
AddComponentRequested?.Invoke(this, componentId);
|
AddComponentRequested?.Invoke(this, componentId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnFindMoreComponentsClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
// 打开设置窗口并导航到插件目录页面
|
||||||
|
if (Application.Current is App app && app.SettingsWindowService is { } settingsWindowService)
|
||||||
|
{
|
||||||
|
var mainWindow = (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow as MainWindow;
|
||||||
|
var request = new SettingsWindowOpenRequest(
|
||||||
|
Source: "FusedDesktopComponentLibrary",
|
||||||
|
Owner: mainWindow,
|
||||||
|
PageId: "plugin-catalog");
|
||||||
|
settingsWindowService.Open(request);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 关闭所在窗口
|
||||||
|
var window = this.FindAncestorOfType<Window>();
|
||||||
|
window?.Close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,57 +1,73 @@
|
|||||||
<Window xmlns="https://github.com/avaloniaui"
|
<Window xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:controls="using:LanMountainDesktop.Views"
|
xmlns:controls="using:LanMountainDesktop.Views"
|
||||||
xmlns:fi="using:FluentIcons.Avalonia"
|
xmlns:fi="using:FluentIcons.Avalonia.Fluent"
|
||||||
x:Class="LanMountainDesktop.Views.FusedDesktopComponentLibraryWindow"
|
x:Class="LanMountainDesktop.Views.FusedDesktopComponentLibraryWindow"
|
||||||
Width="860" Height="620"
|
Width="860" Height="620"
|
||||||
MinWidth="600" MinHeight="500"
|
MinWidth="600" MinHeight="500"
|
||||||
|
CanResize="True"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
SystemDecorations="Full"
|
SystemDecorations="BorderOnly"
|
||||||
ExtendClientAreaToDecorationsHint="True"
|
ExtendClientAreaToDecorationsHint="True"
|
||||||
ExtendClientAreaChromeHints="NoChrome"
|
ExtendClientAreaChromeHints="NoChrome"
|
||||||
ExtendClientAreaTitleBarHeightHint="-1"
|
ExtendClientAreaTitleBarHeightHint="48"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
TransparencyLevelHint="Mica"
|
Title="添加小组件">
|
||||||
Title="融合桌面组件库">
|
|
||||||
|
<Grid x:Name="RootGrid"
|
||||||
<Panel>
|
Classes="settings-scope"
|
||||||
<!-- 背景磨砂效果 -->
|
Background="{DynamicResource AdaptiveSettingsWindowBackgroundBrush}"
|
||||||
<Border Background="{DynamicResource AdaptiveSurfaceLowBrush}"
|
RowDefinitions="Auto,*">
|
||||||
Opacity="0.85" />
|
<!-- 自定义标题栏 - 与 SettingsWindow 风格一致 -->
|
||||||
|
<Border x:Name="WindowTitleBarHost"
|
||||||
<Grid RowDefinitions="Auto,*">
|
Height="48"
|
||||||
<!-- 自定义标题栏 -->
|
Padding="12,0,12,0"
|
||||||
<Border Background="Transparent"
|
Background="{DynamicResource AdaptiveSettingsWindowBackgroundBrush}"
|
||||||
IsHitTestVisible="True"
|
BorderBrush="{DynamicResource AdaptiveSettingsWindowBorderBrush}"
|
||||||
Padding="20,16">
|
BorderThickness="0,0,0,1"
|
||||||
<Grid ColumnDefinitions="*,Auto">
|
PointerPressed="OnWindowTitleBarPointerPressed">
|
||||||
<StackPanel Spacing="6" VerticalAlignment="Center">
|
<Grid ColumnDefinitions="Auto,Auto,*,Auto"
|
||||||
<TextBlock Text="融合桌面组件库"
|
ColumnSpacing="8"
|
||||||
FontWeight="SemiBold"
|
VerticalAlignment="Center">
|
||||||
FontSize="20"
|
<fi:FluentIcon x:Name="WindowBrandIcon"
|
||||||
Foreground="{DynamicResource AdaptiveTextPrimaryBrush}" />
|
Icon="Apps"
|
||||||
<TextBlock Text="将精美组件放置在您的系统桌面上(负一屏)"
|
IconVariant="Filled"
|
||||||
Opacity="0.6"
|
FontSize="16"
|
||||||
FontSize="13"
|
IsHitTestVisible="False"
|
||||||
Foreground="{DynamicResource AdaptiveTextPrimaryBrush}" />
|
VerticalAlignment="Center" />
|
||||||
</StackPanel>
|
|
||||||
|
<TextBlock x:Name="WindowTitleTextBlock"
|
||||||
<Button Grid.Column="1"
|
Grid.Column="1"
|
||||||
Classes="accent"
|
FontSize="12"
|
||||||
Width="36" Height="36"
|
FontWeight="SemiBold"
|
||||||
Padding="0"
|
IsHitTestVisible="False"
|
||||||
CornerRadius="18"
|
Text="添加小组件" />
|
||||||
BorderThickness="0"
|
|
||||||
Background="{DynamicResource AdaptiveButtonHoverBackgroundBrush}"
|
<TextBlock Grid.Column="2"
|
||||||
Click="OnCloseClick">
|
FontSize="12"
|
||||||
<fi:SymbolIcon Symbol="Dismiss" FontSize="18" />
|
Opacity="0.6"
|
||||||
</Button>
|
IsHitTestVisible="False"
|
||||||
</Grid>
|
VerticalAlignment="Center"
|
||||||
</Border>
|
Text="将精美组件放置在您的系统桌面上(负一屏)" />
|
||||||
|
|
||||||
<!-- 组件库控件 -->
|
<Button x:Name="CloseWindowButton"
|
||||||
<controls:FusedDesktopComponentLibraryControl x:Name="LibraryControl"
|
Grid.Column="3"
|
||||||
Grid.Row="1" />
|
Width="40"
|
||||||
</Grid>
|
Height="32"
|
||||||
</Panel>
|
Padding="0"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
Click="OnCloseClick">
|
||||||
|
<fi:FluentIcon Icon="Dismiss"
|
||||||
|
IconVariant="Regular"
|
||||||
|
FontSize="16" />
|
||||||
|
</Button>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<!-- 组件库控件 -->
|
||||||
|
<controls:FusedDesktopComponentLibraryControl x:Name="LibraryControl"
|
||||||
|
Grid.Row="1"
|
||||||
|
Margin="12,8,16,8" />
|
||||||
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
|
using Avalonia.Input;
|
||||||
using Avalonia.Interactivity;
|
using Avalonia.Interactivity;
|
||||||
using LanMountainDesktop.ComponentSystem;
|
using LanMountainDesktop.ComponentSystem;
|
||||||
using LanMountainDesktop.Services;
|
using LanMountainDesktop.Services;
|
||||||
@@ -102,6 +103,14 @@ public partial class FusedDesktopComponentLibraryWindow : Window
|
|||||||
{
|
{
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnWindowTitleBarPointerPressed(object? sender, PointerPressedEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
|
||||||
|
{
|
||||||
|
BeginMoveDrag(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected override void OnClosed(EventArgs e)
|
protected override void OnClosed(EventArgs e)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4286,6 +4286,10 @@ public partial class MainWindow
|
|||||||
{
|
{
|
||||||
whiteboard.ForceSaveNote();
|
whiteboard.ForceSaveNote();
|
||||||
}
|
}
|
||||||
|
else if (contentHost?.Child is StickyNoteWidget stickyNote)
|
||||||
|
{
|
||||||
|
stickyNote.ForceSave();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,14 @@
|
|||||||
#define MyAppArch "x64"
|
#define MyAppArch "x64"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef MyAppSuffix
|
||||||
|
#define MyAppSuffix ""
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef IsSelfContained
|
||||||
|
#define IsSelfContained "true"
|
||||||
|
#endif
|
||||||
|
|
||||||
[Setup]
|
[Setup]
|
||||||
AppId={#MyAppId}
|
AppId={#MyAppId}
|
||||||
AppName={#MyAppName}
|
AppName={#MyAppName}
|
||||||
@@ -34,7 +42,7 @@ LanguageDetectionMethod=uilanguage
|
|||||||
DefaultGroupName={cm:AppShortcutName}
|
DefaultGroupName={cm:AppShortcutName}
|
||||||
UninstallDisplayIcon={app}\{#MyAppExeName}
|
UninstallDisplayIcon={app}\{#MyAppExeName}
|
||||||
OutputDir={#MyOutputDir}
|
OutputDir={#MyOutputDir}
|
||||||
OutputBaseFilename={#MyAppName}-Setup-{#MyAppVersion}-{#MyAppArch}
|
OutputBaseFilename={#MyAppName}-Setup-{#MyAppVersion}-{#MyAppArch}{#MyAppSuffix}
|
||||||
Compression=lzma2/ultra64
|
Compression=lzma2/ultra64
|
||||||
SolidCompression=yes
|
SolidCompression=yes
|
||||||
WizardStyle=modern
|
WizardStyle=modern
|
||||||
@@ -93,7 +101,17 @@ chinesesimplified.UpgradeCleanupMissingUninstaller=安装程序发现了现有
|
|||||||
english.UpgradeCleanupFailedPrefix=Setup could not remove the existing installation automatically. Error code:
|
english.UpgradeCleanupFailedPrefix=Setup could not remove the existing installation automatically. Error code:
|
||||||
chinesesimplified.UpgradeCleanupFailedPrefix=安装程序无法自动移除现有安装。错误代码:
|
chinesesimplified.UpgradeCleanupFailedPrefix=安装程序无法自动移除现有安装。错误代码:
|
||||||
english.UpgradeCleanupFailedSuffix=Please close LanMountainDesktop, uninstall the current version manually, and then run this installer again.
|
english.UpgradeCleanupFailedSuffix=Please close LanMountainDesktop, uninstall the current version manually, and then run this installer again.
|
||||||
chinesesimplified.UpgradeCleanupFailedSuffix=请关闭 LanMountainDesktop,手动卸载当前版本,然后重新运行此安装程序。
|
chinesesimplified.UpgradeCleanupFailedSuffix=请关闭 LanMountain Desktop,手动卸载当前版本,然后重新运行此安装程序。
|
||||||
|
english.DotNetRuntimeMissingTitle=.NET Desktop Runtime Required
|
||||||
|
chinesesimplified.DotNetRuntimeMissingTitle=需要 .NET Desktop Runtime
|
||||||
|
english.DotNetRuntimeMissingMessage=This application requires .NET 10.0 Desktop Runtime to run.
|
||||||
|
chinesesimplified.DotNetRuntimeMissingMessage=此应用程序需要 .NET 10.0 Desktop Runtime 才能运行。
|
||||||
|
english.DotNetRuntimeMissingAction=Click "Yes" to open the official download page. Install it first, then run this installer again.
|
||||||
|
chinesesimplified.DotNetRuntimeMissingAction=单击"是"打开官方下载页面。请先完成安装,然后重新运行此安装程序。
|
||||||
|
english.DotNetRuntimeOpenFailedMessage=Unable to open the download page automatically.
|
||||||
|
chinesesimplified.DotNetRuntimeOpenFailedMessage=无法自动打开下载页面。
|
||||||
|
english.DotNetRuntimeOpenFailedAction=Please open this URL manually:
|
||||||
|
chinesesimplified.DotNetRuntimeOpenFailedAction=请手动打开以下链接:
|
||||||
|
|
||||||
[Tasks]
|
[Tasks]
|
||||||
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
|
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
|
||||||
@@ -127,6 +145,7 @@ const
|
|||||||
UninstallRegSubkey = 'Software\Microsoft\Windows\CurrentVersion\Uninstall\{#MyAppRegistryId}_is1';
|
UninstallRegSubkey = 'Software\Microsoft\Windows\CurrentVersion\Uninstall\{#MyAppRegistryId}_is1';
|
||||||
WebView2RuntimeKeyPath = 'SOFTWARE\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}';
|
WebView2RuntimeKeyPath = 'SOFTWARE\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}';
|
||||||
WebView2RuntimeDownloadUrl = 'https://go.microsoft.com/fwlink/p/?LinkId=2124703';
|
WebView2RuntimeDownloadUrl = 'https://go.microsoft.com/fwlink/p/?LinkId=2124703';
|
||||||
|
DotNetRuntimeDownloadUrl = 'https://dotnet.microsoft.com/download/dotnet/10.0';
|
||||||
UpgradeChoiceInPlace = 0;
|
UpgradeChoiceInPlace = 0;
|
||||||
UpgradeChoiceRelocate = 1;
|
UpgradeChoiceRelocate = 1;
|
||||||
|
|
||||||
@@ -435,10 +454,110 @@ begin
|
|||||||
RegQueryStringValue(HKCU32, WebView2RuntimeKeyPath, 'pv', VersionValue);
|
RegQueryStringValue(HKCU32, WebView2RuntimeKeyPath, 'pv', VersionValue);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
// Checks whether a .NET 10.x shared framework is installed under the given
|
||||||
|
// base path by enumerating version sub-directories and looking for one that
|
||||||
|
// starts with '10.'.
|
||||||
|
function IsDotNet10RuntimePresent(const BasePath: String): Boolean;
|
||||||
|
var
|
||||||
|
FindRec: TFindRec;
|
||||||
|
begin
|
||||||
|
Result := False;
|
||||||
|
if not DirExists(BasePath) then
|
||||||
|
begin
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
|
||||||
|
if FindFirst(BasePath + '\*', FindRec) then
|
||||||
|
begin
|
||||||
|
try
|
||||||
|
repeat
|
||||||
|
if (FindRec.Attributes and FILE_ATTRIBUTE_DIRECTORY <> 0) and
|
||||||
|
(Length(FindRec.Name) >= 3) and
|
||||||
|
(Copy(FindRec.Name, 1, 3) = '10.') then
|
||||||
|
begin
|
||||||
|
Result := True;
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
until not FindNext(FindRec);
|
||||||
|
finally
|
||||||
|
FindClose(FindRec);
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
// Returns True when the .NET 10 Desktop Runtime (or the .NET 10 Core Runtime
|
||||||
|
// which is sufficient for Avalonia apps) is found on the system.
|
||||||
|
// We check both Microsoft.WindowsDesktop.App and Microsoft.NETCore.App because
|
||||||
|
// the runtimeconfig.json may reference either framework depending on the
|
||||||
|
// publish mode and the app only needs the one it actually references.
|
||||||
|
function IsDotNetDesktopRuntimeInstalled(): Boolean;
|
||||||
|
var
|
||||||
|
BasePath: String;
|
||||||
|
begin
|
||||||
|
Result := False;
|
||||||
|
|
||||||
|
// Check 64-bit Program Files
|
||||||
|
BasePath := ExpandConstant('{commonpf64}\dotnet\shared\Microsoft.WindowsDesktop.App');
|
||||||
|
if IsDotNet10RuntimePresent(BasePath) then
|
||||||
|
begin
|
||||||
|
Result := True;
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
|
||||||
|
BasePath := ExpandConstant('{commonpf64}\dotnet\shared\Microsoft.NETCore.App');
|
||||||
|
if IsDotNet10RuntimePresent(BasePath) then
|
||||||
|
begin
|
||||||
|
Result := True;
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
|
||||||
|
// Check 32-bit Program Files
|
||||||
|
BasePath := ExpandConstant('{commonpf}\dotnet\shared\Microsoft.WindowsDesktop.App');
|
||||||
|
if IsDotNet10RuntimePresent(BasePath) then
|
||||||
|
begin
|
||||||
|
Result := True;
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
|
||||||
|
BasePath := ExpandConstant('{commonpf}\dotnet\shared\Microsoft.NETCore.App');
|
||||||
|
if IsDotNet10RuntimePresent(BasePath) then
|
||||||
|
begin
|
||||||
|
Result := True;
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
function InitializeSetup(): Boolean;
|
function InitializeSetup(): Boolean;
|
||||||
var
|
var
|
||||||
ErrorCode: Integer;
|
ErrorCode: Integer;
|
||||||
|
IsSelfContainedBuild: Boolean;
|
||||||
begin
|
begin
|
||||||
|
IsSelfContainedBuild := ('{#IsSelfContained}' = 'true');
|
||||||
|
|
||||||
|
if not IsSelfContainedBuild then
|
||||||
|
begin
|
||||||
|
if not IsDotNetDesktopRuntimeInstalled() then
|
||||||
|
begin
|
||||||
|
if MsgBox(
|
||||||
|
CustomMessage('DotNetRuntimeMissingMessage') + #13#10#13#10 +
|
||||||
|
CustomMessage('DotNetRuntimeMissingAction'),
|
||||||
|
mbConfirmation,
|
||||||
|
MB_YESNO) = IDYES then
|
||||||
|
begin
|
||||||
|
if not ShellExec('open', DotNetRuntimeDownloadUrl, '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode) then
|
||||||
|
begin
|
||||||
|
MsgBox(
|
||||||
|
CustomMessage('DotNetRuntimeOpenFailedMessage') + #13#10 +
|
||||||
|
CustomMessage('DotNetRuntimeOpenFailedAction') + #13#10 + DotNetRuntimeDownloadUrl,
|
||||||
|
mbError,
|
||||||
|
MB_OK);
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
Result := False;
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
if IsWebView2RuntimeInstalled() then
|
if IsWebView2RuntimeInstalled() then
|
||||||
begin
|
begin
|
||||||
Result := True;
|
Result := True;
|
||||||
|
|||||||
@@ -848,6 +848,8 @@ public sealed class PluginLoader
|
|||||||
|
|
||||||
private sealed class PluginRuntimeContext : IPluginRuntimeContext
|
private sealed class PluginRuntimeContext : IPluginRuntimeContext
|
||||||
{
|
{
|
||||||
|
private readonly PluginAppearanceContext _appearanceContext;
|
||||||
|
|
||||||
public PluginRuntimeContext(
|
public PluginRuntimeContext(
|
||||||
PluginManifest manifest,
|
PluginManifest manifest,
|
||||||
string pluginDirectory,
|
string pluginDirectory,
|
||||||
@@ -859,7 +861,8 @@ public sealed class PluginLoader
|
|||||||
PluginDirectory = pluginDirectory;
|
PluginDirectory = pluginDirectory;
|
||||||
DataDirectory = dataDirectory;
|
DataDirectory = dataDirectory;
|
||||||
Properties = properties;
|
Properties = properties;
|
||||||
Appearance = new PluginAppearanceContext(appearanceSnapshot);
|
_appearanceContext = new PluginAppearanceContext(appearanceSnapshot);
|
||||||
|
Appearance = _appearanceContext;
|
||||||
Services = NullServiceProvider.Instance;
|
Services = NullServiceProvider.Instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -898,6 +901,14 @@ public sealed class PluginLoader
|
|||||||
{
|
{
|
||||||
Services = services ?? throw new ArgumentNullException(nameof(services));
|
Services = services ?? throw new ArgumentNullException(nameof(services));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新外观快照并通知插件。
|
||||||
|
/// </summary>
|
||||||
|
internal void UpdateAppearanceSnapshot(PluginAppearanceSnapshot newSnapshot, IReadOnlyCollection<AppearanceProperty> changedProperties)
|
||||||
|
{
|
||||||
|
_appearanceContext.UpdateSnapshot(newSnapshot, changedProperties);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private sealed class PluginMessageBus : IPluginMessageBus, IDisposable
|
private sealed class PluginMessageBus : IPluginMessageBus, IDisposable
|
||||||
|
|||||||
683
design.md
Normal file
683
design.md
Normal file
@@ -0,0 +1,683 @@
|
|||||||
|
# UI Design System Guide (design.md)
|
||||||
|
|
||||||
|
> **目标**: 让 AI 正确使用 Fluent Avalonia / Fluent Icons / Material Avalonia,避免窗口套窗口、容器套容器
|
||||||
|
>
|
||||||
|
> **最后更新**: 2026-04-11
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 一句话总结
|
||||||
|
|
||||||
|
**主界面用 Fluent + FluentIcon,编辑器用 Material + MaterialIcon,永远不要混用,保持扁平结构。**
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. 技术栈与职责
|
||||||
|
|
||||||
|
### 1.1 库清单
|
||||||
|
|
||||||
|
| 库 | 包名 | 什么时候用 |
|
||||||
|
|---|------|----------|
|
||||||
|
| **FluentAvaloniaUI** | `FluentAvaloniaUI` | 主界面、设置页、导航 |
|
||||||
|
| **FluentIcons.Avalonia.Fluent** | `FluentIcons.Avalonia.Fluent` | 主界面图标(**首选**)|
|
||||||
|
| **FluentIcons.Avalonia** | `FluentIcons.Avalonia` | 旧图标兼容(SymbolIcon)|
|
||||||
|
| **Material.Icons.Avalonia** | `Material.Icons.Avalonia` | 编辑器图标(**仅限 ComponentEditorWindow**)|
|
||||||
|
| **Material.Avalonia** | `Material.Avalonia` | MD3 主题(**仅限 ComponentEditorWindow**)|
|
||||||
|
|
||||||
|
### 1.2 初始化顺序(App.axaml)
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<Application.Styles>
|
||||||
|
<sty:FluentAvaloniaTheme /> <!-- 第 1 位:基础 Win11 风格 -->
|
||||||
|
<mi:MaterialIconStyles /> <!-- 第 2 位:全局注册 Material Icons 样式 -->
|
||||||
|
|
||||||
|
<!-- 项目自定义样式 -->
|
||||||
|
<StyleInclude Source="avares://LanMountainDesktop/Styles/FlutermotionToken.axaml" />
|
||||||
|
<StyleInclude Source="avares://LanMountainDesktop/Styles/GlassModule.axaml" />
|
||||||
|
<StyleInclude Source="avares://LanMountainDesktop/Styles/SettingsAnimations.axaml" />
|
||||||
|
<StyleInclude Source="avares://LanMountainDesktop/Styles/SettingsCardStyles.axaml" />
|
||||||
|
<StyleInclude Source="avares://LanMountainDesktop/Styles/NavigationStyles.axaml" />
|
||||||
|
</Application.Styles>
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. 命名空间速查表
|
||||||
|
|
||||||
|
**复制粘贴用:**
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<!-- 必需 -->
|
||||||
|
xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
|
||||||
|
<!-- FluentAvaloniaUI 控件(主界面/设置页必需)-->
|
||||||
|
xmlns:ui="using:FluentAvalonia.UI.Controls"
|
||||||
|
|
||||||
|
<!-- Fluent Icons - 新版推荐(主界面首选)-->
|
||||||
|
xmlns:fi="using:FluentIcons.Avalonia.Fluent"
|
||||||
|
|
||||||
|
<!-- Fluent Icons - 旧版兼容(已有代码维护用)-->
|
||||||
|
<!-- xmlns:fi-legacy="using:FluentIcons.Avalonia" -->
|
||||||
|
|
||||||
|
<!-- Material Icons(仅 ComponentEditorWindow 使用)-->
|
||||||
|
<!-- xmlns:mi="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" -->
|
||||||
|
|
||||||
|
<!-- Material Theme(仅 ComponentEditorWindow 使用)-->
|
||||||
|
<!-- xmlns:themes="clr-namespace:Material.Styles.Themes;assembly=Material.Styles" -->
|
||||||
|
|
||||||
|
<!-- 项目控件 -->
|
||||||
|
xmlns:local="using:LanMountainDesktop.Controls"
|
||||||
|
xmlns:comp="using:LanMountainDesktop.Views.Components"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. 图标系统
|
||||||
|
|
||||||
|
### 3.1 选择决策树
|
||||||
|
|
||||||
|
```
|
||||||
|
你在写什么?
|
||||||
|
├─ 设置页面 / 主界面 / 桌面组件?
|
||||||
|
│ └─ 用 FluentIcon(fi:FluentIcon)
|
||||||
|
│ ├─ 需要 Filled/Regular 切换?→ IconVariant="Filled" 或 "Regular"
|
||||||
|
│ └─ 简单静态图标?→ 也用 FluentIcon,不用 SymbolIcon
|
||||||
|
│
|
||||||
|
├─ ComponentEditorWindow 及其子页面?
|
||||||
|
│ └─ 用 MaterialIcon(mi:MaterialIcon)
|
||||||
|
│
|
||||||
|
└─ 其他情况?
|
||||||
|
└─ 默认 FluentIcon
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3.2 FluentIcon 使用方法
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<fi:FluentIcon Icon="Settings" <!-- 图标名称 -->
|
||||||
|
IconVariant="Filled" <!-- Filled | Regular -->
|
||||||
|
Classes="icon-m" /> <!-- icon-s(12px) | icon-m(16px) | icon-l(20px) -->
|
||||||
|
```
|
||||||
|
|
||||||
|
**常用图标名称:**
|
||||||
|
- 导航类:`Home`, `Settings`, `Navigation`, `ArrowLeft`, `ChevronRight`, `Dismiss`
|
||||||
|
- 操作类:`Add`, `Delete`, `Edit`, `Save`, `Refresh`, `Sync`, `ArrowSync`
|
||||||
|
- 状态类:`Info`, `Warning`, `ErrorBadge`, `CheckmarkCircle`
|
||||||
|
- 外观类:`ThemeLightDark`, `ColorBackground`, `Appearance`
|
||||||
|
|
||||||
|
### 3.3 MaterialIcon 使用方法(仅限编辑器)
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<mi:MaterialIcon Kind="Close" <!-- 图标名称 -->
|
||||||
|
Width="24"
|
||||||
|
Height="24"
|
||||||
|
Foreground="{DynamicResource EditorPrimaryBrush}" />
|
||||||
|
```
|
||||||
|
|
||||||
|
**常用 Kind 值:**
|
||||||
|
- 操作:`Close`, `Check`, `Pencil`, `Delete`, `Settings`, `Plus`
|
||||||
|
- 导航:`ArrowLeft`, `ArrowRight`, `Home`, `Menu`
|
||||||
|
- 系统:`Power`, `Lock`, `ExitToApp`, `Refresh`, `WeatherNight`
|
||||||
|
|
||||||
|
### 3.4 ❌ 禁止事项
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<!-- ❌ 错误:同一区域混用两种图标库 -->
|
||||||
|
<StackPanel>
|
||||||
|
<fi:FluentIcon Icon="Home" /> <!-- Fluent -->
|
||||||
|
<mi:MaterialIcon Kind="Settings" /> <!-- Material -->
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<!-- ❌ 错误:硬编码尺寸 -->
|
||||||
|
<fi:FluentIcon Icon="Settings" FontSize="18" />
|
||||||
|
|
||||||
|
<!-- ✅ 正确:使用预定义 class -->
|
||||||
|
<fi:FluentIcon Icon="Settings" Classes="icon-m" />
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. 容器嵌套规范(核心!)
|
||||||
|
|
||||||
|
### 4.1 最大深度限制
|
||||||
|
|
||||||
|
| 场景 | 最大层数 | 从哪里开始数 |
|
||||||
|
|-----|---------|------------|
|
||||||
|
| 普通页面 | **≤ 4 层** | Window/UserControl → ... → 叶子节点 |
|
||||||
|
| Popup/Dialog | **≤ 3 层** | Border → Content |
|
||||||
|
| 列表项/DataTemplate | **≤ 3 层** | Root → ... → 元素 |
|
||||||
|
| MainWindow 桌面布局 | **≤ 6 层** | 特殊允许(多层叠加需求)|
|
||||||
|
|
||||||
|
### 4.2 如何数层级?
|
||||||
|
|
||||||
|
从根元素到目标元素经过的容器标签数:
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<UserControl> <!-- 层级 0(根)-->
|
||||||
|
<Border> <!-- 层级 1 -->
|
||||||
|
<Grid> <!-- 层级 2 -->
|
||||||
|
<StackPanel> <!-- 层级 3 -->
|
||||||
|
<Button> <!-- 层级 4(叶子节点)✅ OK -->
|
||||||
|
</Button>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</UserControl>
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4.3 推荐的标准结构
|
||||||
|
|
||||||
|
#### 结构 A:标准设置页面(3-4 层)
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<UserControl>
|
||||||
|
<ScrollViewer> <!-- 层 1 -->
|
||||||
|
<StackPanel Spacing="24"> <!-- 层 2 -->
|
||||||
|
<Border Classes="settings-section-card"> <!-- 层 3 -->
|
||||||
|
<StackPanel Spacing="16"> <!-- 层 4 ✅ -->
|
||||||
|
<!-- 内容 -->
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
</StackPanel>
|
||||||
|
</ScrollViewer>
|
||||||
|
</UserControl>
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 结构 B:卡片/面板组件(3 层)
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<Border CornerRadius="..." Padding="..."> <!-- 层 1(根)-->
|
||||||
|
<Grid RowDefinitions="Auto,*"> <!-- 层 2 -->
|
||||||
|
<Grid ColumnDefinitions="Auto,*,Auto"> <!-- 层 3a: Header -->
|
||||||
|
<fi:FluentIcon Classes="icon-l" />
|
||||||
|
<TextBlock Grid.Column="1" />
|
||||||
|
<ContentPresenter Grid.Column="2" />
|
||||||
|
</Grid>
|
||||||
|
<ContentControl Grid.Row="1" /> <!-- 层 3b: Body ✅ -->
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 结构 C:列表项(2-3 层)
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<Border Classes="list-item"> <!-- 层 1 -->
|
||||||
|
<Grid ColumnDefinitions="Auto,*,Auto"> <!-- 层 2 -->
|
||||||
|
<Border Classes="icon-host"> <!-- 层 3a -->
|
||||||
|
<fi:FluentIcon Classes="icon-m" />
|
||||||
|
</Border>
|
||||||
|
<StackPanel Grid.Column="1" Spacing="4"> <!-- 层 3b -->
|
||||||
|
<TextBlock Classes="title" />
|
||||||
|
<TextBlock Classes="subtitle" />
|
||||||
|
</StackPanel>
|
||||||
|
<Button Grid.Column="2">...</Button> <!-- 层 3c ✅ -->
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4.4 ❌ 反模式:过度嵌套
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<!-- ❌ 错误:7 层嵌套(实际项目中出现的反面教材)-->
|
||||||
|
<Grid> <!-- 1 -->
|
||||||
|
<Grid> <!-- 2 -->
|
||||||
|
<Border> <!-- 3 -->
|
||||||
|
<Grid> <!-- 4 -->
|
||||||
|
<Border> <!-- 5 -->
|
||||||
|
<Grid> <!-- 6 -->
|
||||||
|
<Border> <!-- 7 ❌ 太深了!-->
|
||||||
|
<Button Content="Click" />
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<!-- ✅ 重构后:2 层 -->
|
||||||
|
<Grid HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center">
|
||||||
|
<Button Content="Click"
|
||||||
|
Padding="16,8" />
|
||||||
|
</Grid>
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4.5 何时可以超过限制?
|
||||||
|
|
||||||
|
只有这 3 种情况:
|
||||||
|
|
||||||
|
1. **MainWindow 桌面布局**(壁纸层 + 组件层 + 拖拽层 + 任务栏)
|
||||||
|
2. **需要独立动画层**(Transform/Opacity 动画需要单独容器)
|
||||||
|
3. **复杂 Popup 内部**
|
||||||
|
|
||||||
|
**必须加注释说明原因:**
|
||||||
|
```xml
|
||||||
|
<!--
|
||||||
|
允许深层嵌套原因:桌面渲染需要支持以下视觉层级
|
||||||
|
- DesktopWallpaperLayer(壁纸背景)
|
||||||
|
- DesktopPagesContainer(桌面分页)
|
||||||
|
- LauncherPagePanel(启动器面板)
|
||||||
|
- Canvas 拖拽层
|
||||||
|
- BottomTaskbarContainer(任务栏)
|
||||||
|
-->
|
||||||
|
<Grid x:Name="DesktopHost">
|
||||||
|
...
|
||||||
|
</Grid>
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. 窗口 vs UserControl vs Border
|
||||||
|
|
||||||
|
### 5.1 什么时候用什么?
|
||||||
|
|
||||||
|
| 需求 | 用什么 | 示例 |
|
||||||
|
|-----|-------|------|
|
||||||
|
| 独立窗口(有标题栏、可拖动、任务栏可见)| **Window** | SettingsWindow, ComponentEditorWindow |
|
||||||
|
| 可复用的 UI 组件块 | **UserControl** | SettingsOptionCard, ClockWidget |
|
||||||
|
| 视觉上的卡片/面板/容器 | **Border** | 设置分区卡片、弹出面板 |
|
||||||
|
|
||||||
|
### 5.2 ❌ 禁止:窗口套窗口
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
// ❌ 错误:在 XAML 中实例化另一个 Window
|
||||||
|
// <local:SettingsWindow Visibility="Visible" />
|
||||||
|
|
||||||
|
// ✅ 正确:通过代码显示独立窗口
|
||||||
|
var settings = new SettingsWindow { Owner = this };
|
||||||
|
settings.Show();
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5.3 ❌ 禁止:把 Window 当 UserControl 用
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<!-- ❌ 错误:MainWindow 内部嵌入了一个本应是独立窗口的东西 -->
|
||||||
|
<Window x:Class="MainWindow">
|
||||||
|
<Grid>
|
||||||
|
<Border x:Name="ComponentLibraryWindow" <!-- 这看起来像窗口,但不应该是 Window -->
|
||||||
|
Width="620"
|
||||||
|
Height="320"
|
||||||
|
CornerRadius="36">
|
||||||
|
<!-- 组件库内容 -->
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
</Window>
|
||||||
|
```
|
||||||
|
|
||||||
|
**如果它不是真正的操作系统窗口,就用 Border 或 UserControl。**
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. 颜色与资源使用规范
|
||||||
|
|
||||||
|
### 6.1 必须使用 DynamicResource
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<!-- ❌ 错误:硬编码颜色 -->
|
||||||
|
<TextBlock Foreground="#FF1D1B20" />
|
||||||
|
<Border Background="#FFF3EDF7" />
|
||||||
|
<Button Background="#FF6750A4" />
|
||||||
|
|
||||||
|
<!-- ✅ 正确:使用动态资源 -->
|
||||||
|
<TextBlock Foreground="{DynamicResource AdaptiveTextPrimaryBrush}" />
|
||||||
|
<Border Background="{DynamicResource AdaptiveSurfaceRaisedBrush}" />
|
||||||
|
<Button Background="{DynamicResource AccentBrush}" />
|
||||||
|
```
|
||||||
|
|
||||||
|
### 6.2 常用资源键速查
|
||||||
|
|
||||||
|
| 资源键 | 用途 | 示例场景 |
|
||||||
|
|--------|------|---------|
|
||||||
|
| `AdaptiveTextPrimaryBrush` | 主要文本 | 标题、正文 |
|
||||||
|
| `AdaptiveTextSecondaryBrush` | 次要文本 | 描述文字、提示 |
|
||||||
|
| `AdaptiveSurfaceRaisedBrush` | 抬高表面 | 卡片背景、面板 |
|
||||||
|
| `AdaptiveSurfaceOverlayBrush` | 覆盖层 | 遮罩、弹窗背景 |
|
||||||
|
| `AccentBrush` | 强调色 | 主按钮、选中态 |
|
||||||
|
| `AppFontFamily` | 应用字体 | 全局字体设置 |
|
||||||
|
|
||||||
|
### 6.3 圆角 Token(强制!)
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<!-- ❌ 错误:硬编码圆角 -->
|
||||||
|
<Border CornerRadius="8" />
|
||||||
|
<Button CornerRadius="12" />
|
||||||
|
|
||||||
|
<!-- ❌ 错误:桌面组件根容器用了非组件级 Token -->
|
||||||
|
<Border CornerRadius="{DynamicResource DesignCornerRadiusMd}" />
|
||||||
|
|
||||||
|
<!-- ✅ 正确 -->
|
||||||
|
<!-- 桌面组件(Widget)根容器必须且只能用这个 -->
|
||||||
|
<Border CornerRadius="{DynamicResource DesignCornerRadiusComponent}" />
|
||||||
|
|
||||||
|
<!-- 内部元素按层级选择 -->
|
||||||
|
<Border CornerRadius="{DynamicResource DesignCornerRadiusSm}" /> <!-- 小 -->
|
||||||
|
<Border CornerRadius="{DynamicResource DesignCornerRadiusMd}" /> <!-- 中 -->
|
||||||
|
<Border CornerRadius="{DynamicResource DesignCornerRadiusLg}" /> <!-- 大 -->
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. FluentAvaloniaUI 控件用法
|
||||||
|
|
||||||
|
### 7.1 NavigationView(设置页导航)
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<ui:NavigationView x:Name="RootNav"
|
||||||
|
PaneDisplayMode="Auto" <!-- 自动折叠 -->
|
||||||
|
OpenPaneLength="283" <!-- Win11 标准宽度 -->
|
||||||
|
IsSettingsVisible="False" <!-- 隐藏默认设置按钮 -->
|
||||||
|
IsBackButtonVisible="False"
|
||||||
|
SelectionChanged="OnNavChanged">
|
||||||
|
|
||||||
|
<ui:NavigationView.Resources>
|
||||||
|
<!-- 移除默认背景色 -->
|
||||||
|
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
|
||||||
|
<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
|
||||||
|
</ui:NavigationView.Resources>
|
||||||
|
|
||||||
|
<Grid Margin="12,0,16,16">
|
||||||
|
<ui:Frame x:Name="ContentFrame" />
|
||||||
|
</Grid>
|
||||||
|
</ui:NavigationView>
|
||||||
|
```
|
||||||
|
|
||||||
|
### 7.2 Frame(页面导航容器)
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<ui:Frame x:Name="ContentFrame" />
|
||||||
|
```
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
// C# 代码中导航
|
||||||
|
ContentFrame.Navigate(typeof(SettingsHomePage));
|
||||||
|
// 或绑定
|
||||||
|
ContentFrame.SourcePageType = typeof(SettingsHomePage);
|
||||||
|
```
|
||||||
|
|
||||||
|
### 7.3 InfoBar(内联通知条)
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<ui:InfoBar Title="发现新版本"
|
||||||
|
Message="v2.0.0 可用"
|
||||||
|
Severity="Informational" <!-- Informational | Warning | Error | Success -->
|
||||||
|
IsOpen="True"
|
||||||
|
ActionButtonText="立即更新"
|
||||||
|
ActionButtonClick="OnUpdateClick"
|
||||||
|
CloseButtonClick="OnDismissClick" />
|
||||||
|
```
|
||||||
|
|
||||||
|
### 7.4 ContentDialog(模态对话框)
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
var dialog = new ContentDialog
|
||||||
|
{
|
||||||
|
Title = "确认删除",
|
||||||
|
Content = "确定要删除吗?此操作不可撤销。",
|
||||||
|
PrimaryButtonText = "删除",
|
||||||
|
CloseButtonText = "取消",
|
||||||
|
DefaultButton = ContentDialogButton.Primary
|
||||||
|
};
|
||||||
|
|
||||||
|
var result = await dialog.ShowAsync(this);
|
||||||
|
if (result == ContentDialogResult.Primary)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. Material.Avalonia 使用规范(严格限制!)
|
||||||
|
|
||||||
|
### 8.1 ⚠️ 只能在这里用
|
||||||
|
|
||||||
|
**✅ 允许:**
|
||||||
|
- `ComponentEditorWindow.axaml`
|
||||||
|
- ComponentEditorWindow 的子编辑页面
|
||||||
|
|
||||||
|
**❌ 禁止:**
|
||||||
|
- MainWindow
|
||||||
|
- SettingsWindow
|
||||||
|
- NotificationWindow
|
||||||
|
- 任何桌面组件(Widget)
|
||||||
|
- 任何其他地方
|
||||||
|
|
||||||
|
### 8.2 如何在 ComponentEditorWindow 中启用
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<Window ...>
|
||||||
|
<Window.Resources>
|
||||||
|
<!-- MD3 色板(仅此窗口有效)-->
|
||||||
|
<SolidColorBrush x:Key="EditorPrimaryBrush" Color="#FF6750A4" />
|
||||||
|
<SolidColorBrush x:Key="EditorSurfaceContainerBrush" Color="#FFF3EDF7" />
|
||||||
|
<SolidColorBrush x:Key="EditorOnPrimaryBrush" Color="#FFFFFFFF" />
|
||||||
|
</Window.Resources>
|
||||||
|
|
||||||
|
<Window.Styles>
|
||||||
|
<!-- 加载 Material 主题(只影响此窗口)-->
|
||||||
|
<themes:CustomMaterialTheme BaseTheme="Light"
|
||||||
|
PrimaryColor="#6750A4"
|
||||||
|
SecondaryColor="#625B71" />
|
||||||
|
|
||||||
|
<!-- 项目自定义覆盖 -->
|
||||||
|
<StyleInclude Source="avares://LanMountainDesktop/Styles/ComponentEditorThemeResources.axaml" />
|
||||||
|
</Window.Styles>
|
||||||
|
</Window>
|
||||||
|
```
|
||||||
|
|
||||||
|
### 8.3 MD3 组件示例
|
||||||
|
|
||||||
|
#### FAB 按钮(浮动操作按钮)
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<Button x:Name="SaveFAB"
|
||||||
|
HorizontalAlignment="Right"
|
||||||
|
VerticalAlignment="Bottom"
|
||||||
|
Margin="28"
|
||||||
|
Width="64" Height="64"
|
||||||
|
Background="{DynamicResource EditorPrimaryBrush}"
|
||||||
|
Foreground="{DynamicResource EditorOnPrimaryBrush}"
|
||||||
|
CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
|
||||||
|
Click="OnSaveClick">
|
||||||
|
<mi:MaterialIcon Kind="Check" Width="32" Height="32" />
|
||||||
|
</Button>
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Top App Bar(顶栏)
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<Border Background="{DynamicResource EditorTopAppBarBackgroundBrush}"
|
||||||
|
Padding="24,16">
|
||||||
|
<Grid ColumnDefinitions="Auto,*,Auto">
|
||||||
|
<mi:MaterialIcon Kind="Widgets"
|
||||||
|
Width="28" Height="28"
|
||||||
|
Foreground="{DynamicResource EditorPrimaryBrush}" />
|
||||||
|
<TextBlock Grid.Column="1"
|
||||||
|
FontSize="20" FontWeight="SemiBold"
|
||||||
|
Text="组件编辑器"
|
||||||
|
Margin="16,0,0,0" />
|
||||||
|
<Button Grid.Column="2" Click="OnCloseClick">
|
||||||
|
<mi:MaterialIcon Kind="Close" Width="24" Height="24" />
|
||||||
|
</Button>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 9. 实战代码模板
|
||||||
|
|
||||||
|
### 模板 1:新建设置页面
|
||||||
|
|
||||||
|
文件位置:`Views/Settings/YourPageName.axaml`
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<UserControl xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:fi="using:FluentIcons.Avalonia.Fluent"
|
||||||
|
xmlns:local="using:LanMountainDesktop.Controls"
|
||||||
|
x:Class="LanMountainDesktop.Views.Settings.YourPageName">
|
||||||
|
|
||||||
|
<ScrollViewer Padding="24,0,24,24">
|
||||||
|
<StackPanel Spacing="24">
|
||||||
|
|
||||||
|
<!-- 分区卡片 -->
|
||||||
|
<Border Classes="settings-section-card">
|
||||||
|
<StackPanel Spacing="16">
|
||||||
|
|
||||||
|
<!-- 分区标题 -->
|
||||||
|
<Grid ColumnDefinitions="Auto,*" ColumnSpacing="12">
|
||||||
|
<fi:FluentIcon Icon="YourSectionIcon"
|
||||||
|
IconVariant="Filled"
|
||||||
|
Classes="icon-l" />
|
||||||
|
<TextBlock Grid.Column="1"
|
||||||
|
Classes="settings-section-title"
|
||||||
|
Text="分区标题" />
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<!-- 选项卡 1 -->
|
||||||
|
<local:SettingsOptionCard Icon="OptionIcon1"
|
||||||
|
Title="选项标题"
|
||||||
|
Title="选项描述">
|
||||||
|
<local:SettingsOptionCard.ActionContent>
|
||||||
|
<ToggleSwitch IsChecked="{Binding YourProperty, Mode=TwoWay}" />
|
||||||
|
</local:SettingsOptionCard.ActionContent>
|
||||||
|
</local:SettingsOptionCard>
|
||||||
|
|
||||||
|
<!-- 选项卡 2 -->
|
||||||
|
<local:SettingsOptionCard Icon="OptionIcon2"
|
||||||
|
Title="另一个选项"
|
||||||
|
Title="描述信息" />
|
||||||
|
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
</StackPanel>
|
||||||
|
</ScrollViewer>
|
||||||
|
</UserControl>
|
||||||
|
```
|
||||||
|
|
||||||
|
**嵌套检查:** ScrollViewer(1) > StackPanel(2) > Border(3) > StackPanel(4) > Items(5) ✅ (因为有 ScrollViewer 容器,5 层可接受)
|
||||||
|
|
||||||
|
### 模板 2:新建桌面小组件
|
||||||
|
|
||||||
|
文件位置:`Views/Components/YourWidget.axaml`
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<UserControl xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
x:Class="LanMountainDesktop.Views.Components.YourWidget">
|
||||||
|
|
||||||
|
<Border Classes="desktop-widget-root"
|
||||||
|
CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
|
||||||
|
Padding="16,12">
|
||||||
|
<Grid RowDefinitions="Auto,*" RowSpacing="8">
|
||||||
|
|
||||||
|
<!-- 标题区 -->
|
||||||
|
<TextBlock x:Name="TitleTextBlock"
|
||||||
|
FontSize="14"
|
||||||
|
FontWeight="SemiBold" />
|
||||||
|
|
||||||
|
<!-- 内容区 -->
|
||||||
|
<ContentControl Grid.Row="1" />
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</UserControl>
|
||||||
|
```
|
||||||
|
|
||||||
|
**嵌套检查:** Border(1) > Grid(2) > Elements(3) ✅ 完美!
|
||||||
|
|
||||||
|
### 模板 3:新建独立窗口
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<Window xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:ui="using:FluentAvalonia.UI.Controls"
|
||||||
|
xmlns:fi="using:FluentIcons.Avalonia.Fluent"
|
||||||
|
x:Class="LanMountainDesktop.Views.YourWindow"
|
||||||
|
Width="800"
|
||||||
|
Height="600"
|
||||||
|
MinWidth="400"
|
||||||
|
MinHeight="300"
|
||||||
|
CanResize="True"
|
||||||
|
SystemDecorations="BorderOnly"
|
||||||
|
Background="Transparent"
|
||||||
|
Title="窗口标题">
|
||||||
|
|
||||||
|
<Grid RowDefinitions="Auto,*">
|
||||||
|
|
||||||
|
<!-- 自定义标题栏 -->
|
||||||
|
<Border Height="48"
|
||||||
|
Padding="12,0"
|
||||||
|
PointerPressed="OnTitleBarPressed">
|
||||||
|
<Grid ColumnDefinitions="Auto,*,Auto">
|
||||||
|
<fi:FluentIcon Icon="WindowIcon"
|
||||||
|
IconVariant="Filled"
|
||||||
|
Classes="icon-m" />
|
||||||
|
<TextBlock Grid.Column="1"
|
||||||
|
Text="{Binding Title}"
|
||||||
|
VerticalAlignment="Center" />
|
||||||
|
<Button Grid.Column="2"
|
||||||
|
Click="OnCloseClick">
|
||||||
|
<fi:FluentIcon Icon="Dismiss" IconVariant="Regular" />
|
||||||
|
</Button>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<!-- 主内容区 -->
|
||||||
|
<ContentControl Grid.Row="1"
|
||||||
|
Content="{Binding Content}" />
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
</Window>
|
||||||
|
```
|
||||||
|
|
||||||
|
**嵌套检查:** Grid(1) > Border(2) > Grid(3) > Elements(4) ✅
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 10. AI 编码检查清单
|
||||||
|
|
||||||
|
### 写代码前问自己
|
||||||
|
|
||||||
|
- [ ] 这个文件是设置页/主界面?→ 用 Fluent + FluentIcon
|
||||||
|
- [ ] 这个文件是 ComponentEditorWindow?→ 用 Material + MaterialIcon
|
||||||
|
- [ ] 我用了正确的命名空间吗?(见第 2 节速查表)
|
||||||
|
- [ ] 图标用了 Classes="icon-s/m/l" 而非硬编码 FontSize 吗?
|
||||||
|
|
||||||
|
### 写完代码后检查
|
||||||
|
|
||||||
|
- [ ] 数一下最大嵌套深度(见第 4.2 节)
|
||||||
|
- [ ] 有没有硬编码颜色值?(应该都用 DynamicResource)
|
||||||
|
- [ ] 有没有硬编码 CornerRadius?(应该用 DesignCornerRadiusXxx)
|
||||||
|
- [ ] 有没有在同一区域混用 FluentIcon 和 MaterialIcon?
|
||||||
|
- [ ] 是不是不小心写了 `<local:SomeWindow>` 在另一个 Window 里?
|
||||||
|
- [ ] 是不是连续写了 Border > Grid > Border > Grid 可以合并?
|
||||||
|
|
||||||
|
### 如果审查别人代码
|
||||||
|
|
||||||
|
- [ ] 发现窗口套窗口了吗?
|
||||||
|
- [ ] 发现超过 4 层的无意义嵌套了吗?(没有注释说明原因的话)
|
||||||
|
- [ ] 发现 Fluent 和 Material 控件混在同一区域了吗?
|
||||||
|
- [ ] 发现应该用 DynamicResource 的地方硬编码了吗?
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 附录:常见错误快速修复
|
||||||
|
|
||||||
|
| 错误现象 | 问题原因 | 修复方法 |
|
||||||
|
|---------|---------|---------|
|
||||||
|
| 图标不显示或大小不对 | 用了错误的命名空间或硬编码尺寸 | 改用 `fi:FluentIcon` + `Classes="icon-m"` |
|
||||||
|
| 圆角在设置里改了但没生效 | 硬编码了 CornerRadius | 改用 `{DynamicResource DesignCornerRadiusComponent}` |
|
||||||
|
| 深色模式下颜色刺眼 | 硬编码了颜色值 | 改用 `{DynamicResource AdaptiveTextPrimaryBrush}` 等 |
|
||||||
|
| 设置页风格和其他窗口不一致 | 混用了 Material 控件 | 统一用 FluentAvaloniaUI 控件 |
|
||||||
|
| 性能差/渲染慢 | 嵌套太深(>6 层)| 扁平化结构,合并多余容器 |
|
||||||
|
| 弹窗显示位置/大小异常 | 把 Window 当成 UserControl 嵌套了 | 改为代码中 `.Show()` 显示 |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**相关文档:**
|
||||||
|
- [VISUAL_SPEC.md](./VISUAL_SPEC.md) - 视觉规范总纲
|
||||||
|
- [CORNER_RADIUS_SPEC.md](./CORNER_RADIUS_SPEC.md) - 圆角详细规范
|
||||||
|
- AGENTS.md - AI 强制规则
|
||||||
Reference in New Issue
Block a user