CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将自定义控件单开一个项目

Browse Source
This commit is contained in:
PrefacedCorg
2026-04-13 13:01:14 +08:00
parent 0a14d96e10
commit 41be1e901d
13 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas.sln
+23 -1
View File
@@ -1,4 +1,4 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 18
VisualStudioVersion = 18.4.11626.88 stable
@@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InkCanvasForClass", "Ink Ca
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvas.PluginSdk", "InkCanvas.PluginSdk\InkCanvas.PluginSdk.csproj", "{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvas.Controls", "InkCanvas.Controls\InkCanvas.Controls.csproj", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -61,6 +63,26 @@ Global
{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x64.Build.0 = Release|Any CPU
{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x86.ActiveCfg = Release|Any CPU
{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x86.Build.0 = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM.ActiveCfg = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM.Build.0 = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM64.Build.0 = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x64.ActiveCfg = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x64.Build.0 = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x86.ActiveCfg = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x86.Build.0 = Debug|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.Build.0 = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM.ActiveCfg = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM.Build.0 = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM64.ActiveCfg = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM64.Build.0 = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x64.ActiveCfg = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x64.Build.0 = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x86.ActiveCfg = Release|Any CPU
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Ink Canvas/Helpers/Converters.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using System;
using System;
using System.Globalization;
using System.Windows;
using System.Windows.Data;
Ink Canvas/InkCanvasForClass.csproj
+1
View File
@@ -148,6 +148,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\InkCanvas.PluginSdk\InkCanvas.PluginSdk.csproj" />
<ProjectReference Include="..\InkCanvas.Controls\InkCanvas.Controls.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(MSBuildRuntimeType)' == 'Full'">
<COMReference Include="IWshRuntimeLibrary">
Ink Canvas/MainWindow.xaml
+3 -2
View File
@@ -7,7 +7,8 @@
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
xmlns:c="clr-namespace:Ink_Canvas.Converter"
xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation"
xmlns:controls="clr-namespace:Ink_Canvas.Controls"
xmlns:controls="clr-namespace:Ink_Canvas.Controls;assembly=InkCanvas.Controls"
xmlns:localControls="clr-namespace:Ink_Canvas.Controls"
xmlns:Windows="clr-namespace:Ink_Canvas.Windows"
xmlns:props="clr-namespace:Ink_Canvas.Properties"
xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions"
@@ -3982,7 +3983,7 @@
</Canvas>
<!-- 快抽悬浮按钮 -->
<controls:QuickDrawFloatingButtonControl x:Name="QuickDrawFloatingButton"
<localControls:QuickDrawFloatingButtonControl x:Name="QuickDrawFloatingButton"
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
Margin="0,0,0,200"
Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml
+1 -1
View File
@@ -7,7 +7,7 @@
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:controls="clr-namespace:Ink_Canvas.Controls"
xmlns:controls="clr-namespace:Ink_Canvas.Controls;assembly=InkCanvas.Controls"
Title="图标设置"
mc:Ignorable="d">
<Grid x:Name="RootGrid">
Ink Canvas/packages.lock.json
+7
View File
@@ -345,6 +345,13 @@
"resolved": "4.5.0",
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
},
"inkcanvas.controls": {
"type": "Project",
"dependencies": {
"iNKORE.UI.WPF": "[1.2.8, )",
"iNKORE.UI.WPF.Modern": "[0.10.2.1, )"
}
},
"inkcanvas.pluginsdk": {
"type": "Project"
}
Ink Canvas/Controls/CopyButton.xaml → InkCanvas.Controls/CopyButton.xaml
View File
Ink Canvas/Controls/CopyButton.xaml.cs → InkCanvas.Controls/CopyButton.xaml.cs
View File
InkCanvas.Controls/InkCanvas.Controls.csproj
+19
View File
@@ -0,0 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<Nullable>disable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>Ink_Canvas.Controls</RootNamespace>
<AssemblyName>InkCanvas.Controls</AssemblyName>
<UseWPF>true</UseWPF>
<LangVersion>10</LangVersion>
<NoWarn>CA1416</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.10.2.1" />
<PackageReference Include="iNKORE.UI.WPF" Version="1.2.8" />
</ItemGroup>
</Project>
Ink Canvas/Controls/LabeledToggleSwitch.xaml → InkCanvas.Controls/LabeledToggleSwitch.xaml
+1 -1
View File
@@ -23,4 +23,4 @@
Foreground="#a1a1aa"
Visibility="Collapsed"/>
</ikw:SimpleStackPanel>
</UserControl>
</UserControl>
Ink Canvas/Controls/LabeledToggleSwitch.xaml.cs → InkCanvas.Controls/LabeledToggleSwitch.xaml.cs
View File
Ink Canvas/Controls/ToolbarImageButton.xaml → InkCanvas.Controls/ToolbarImageButton.xaml
View File
Ink Canvas/Controls/ToolbarImageButton.xaml.cs → InkCanvas.Controls/ToolbarImageButton.xaml.cs
+1 -1
View File
@@ -107,4 +107,4 @@ namespace Ink_Canvas.Controls
ButtonMouseUp?.Invoke(this, new RoutedEventArgs(e.RoutedEvent, this));
}
}
}
}