From c6972a7d95fdf3699e185f6fa84b9286fc3f760c Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 27 Nov 2018 10:50:51 +0800
Subject: [PATCH] Fixed bug that could not compile on net45
---
DockBoxResearch/DockBoxResearch.csproj | 10 ++++++++++
HandyControl.sln | 11 +++++------
HandyControl/Controls/Text/OutlineText.cs | 10 +++++++++-
HandyControl/HandyControl.csproj | 14 +++++++++++++-
HandyControlDemo/HandyControlDemo.csproj | 15 ++++++++++++++-
5 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/DockBoxResearch/DockBoxResearch.csproj b/DockBoxResearch/DockBoxResearch.csproj
index 3f665051..7a17aa07 100644
--- a/DockBoxResearch/DockBoxResearch.csproj
+++ b/DockBoxResearch/DockBoxResearch.csproj
@@ -33,6 +33,16 @@
prompt
4
+
+ true
+ bin\Debug-Net45\
+ DEBUG;TRACE
+ full
+ AnyCPU
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
diff --git a/HandyControl.sln b/HandyControl.sln
index 72cb5e66..51457f1d 100644
--- a/HandyControl.sln
+++ b/HandyControl.sln
@@ -7,26 +7,25 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl", "HandyContro
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo", "HandyControlDemo\HandyControlDemo.csproj", "{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DockBoxResearch", "DockBoxResearch\DockBoxResearch.csproj", "{8A444D0A-E3DD-446F-95C4-0A132179D20F}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug-Net45|Any CPU = Debug-Net45|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU
+ {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU
{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release|Any CPU.Build.0 = Release|Any CPU
{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU
+ {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU
{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release|Any CPU.Build.0 = Release|Any CPU
- {8A444D0A-E3DD-446F-95C4-0A132179D20F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8A444D0A-E3DD-446F-95C4-0A132179D20F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8A444D0A-E3DD-446F-95C4-0A132179D20F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8A444D0A-E3DD-446F-95C4-0A132179D20F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/HandyControl/Controls/Text/OutlineText.cs b/HandyControl/Controls/Text/OutlineText.cs
index 42161c24..1b73dd3f 100644
--- a/HandyControl/Controls/Text/OutlineText.cs
+++ b/HandyControl/Controls/Text/OutlineText.cs
@@ -153,19 +153,27 @@ namespace HandyControl.Controls
return;
}
+#if net45
+ _formattedText = new FormattedText(
+ Text,
+ CultureInfo.CurrentUICulture,
+ FlowDirection,
+ new Typeface(FontFamily, FontStyle, FontWeight, FontStretch),
+ FontSize, Fill);
+#else
var source = PresentationSource.FromVisual(this);
var dpi = 1.0;
if (source?.CompositionTarget != null)
{
dpi = 96.0 * source.CompositionTarget.TransformToDevice.M11 / 96.0;
}
-
_formattedText = new FormattedText(
Text,
CultureInfo.CurrentUICulture,
FlowDirection,
new Typeface(FontFamily, FontStyle, FontWeight, FontStretch),
FontSize, Fill, dpi);
+#endif
UpdateFormattedText();
}
diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index 7ce2855a..78a8655f 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -8,7 +8,7 @@
library
HandyControl
HandyControl
- v4.6.2
+
512
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
4
@@ -22,6 +22,17 @@
DEBUG;TRACE
prompt
4
+ v4.6.2
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE;net45
+ prompt
+ 4
+ v4.5
pdbonly
@@ -31,6 +42,7 @@
prompt
4
bin\Release\HandyControl.xml
+ v4.6.2
diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj
index 70085e16..0e640d32 100644
--- a/HandyControlDemo/HandyControlDemo.csproj
+++ b/HandyControlDemo/HandyControlDemo.csproj
@@ -8,11 +8,11 @@
WinExe
HandyControlDemo
HandyControlDemo
- v4.6.2
512
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
4
true
+
AnyCPU
@@ -23,6 +23,7 @@
DEBUG;TRACE
prompt
4
+ v4.6.2
AnyCPU
@@ -32,10 +33,22 @@
TRACE
prompt
4
+ v4.6.2
Resources\Img\icon.ico
+
+ AnyCPU
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+ v4.5
+
..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll