在DEMO程序中添加了HighDPI支持

448333839 · Mar 1, 2018 · 59be87b · 59be87b
1 parent 4c0a46b
commit 59be87b
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 1 deletion.
diff --git a/BorderlessFormStyleDemoApp/BorderlessFormStyleDemoApp.csproj b/BorderlessFormStyleDemoApp/BorderlessFormStyleDemoApp.csproj
@@ -37,6 +37,9 @@
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -82,6 +85,7 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <EmbeddedResource Include="assets\fonts\fontawesome-webfont.woff2" />
+    <None Include="app.manifest" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

diff --git a/BorderlessFormStyleDemoApp/app.manifest b/BorderlessFormStyleDemoApp/app.manifest
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC 清单选项
+             如果想要更改 Windows 用户帐户控制级别，请使用
+             以下节点之一替换 requestedExecutionLevel 节点。n
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
+            如果你的应用程序需要此虚拟化来实现向后兼容性，则删除此
+            元素。
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
+           Windows 版本的列表。取消评论适当的元素，Windows 将
+           自动选择最兼容的环境。 -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- 指示该应用程序可以感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
+       自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
+       选择加入。选择加入此设置的 Windows 窗体应用程序(目标设定为 .NET Framework 4.6 )还应
+       在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。-->
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+
+
+  <!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
+
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+
+
+</assembly>
diff --git a/NetDimension.NanUI/Bootstrap.cs b/NetDimension.NanUI/Bootstrap.cs
@@ -266,6 +266,7 @@ public static bool Load(Action<CfxSettings> settingsBuildAction = null, Action<C
 					Directory.CreateDirectory(ApplicationCacheDirectory);
 				}
 
+				//This should be enabled on next NanUI version. On 2987, it will cause some issues.
 				CfxRuntime.EnableHighDpiSupport();
 				args.Settings.JavascriptFlags = "--expose-gc";
 
@@ -293,7 +294,8 @@ public static bool Load(Action<CfxSettings> settingsBuildAction = null, Action<C
 			{
 				CheckIfCefHasBeenInitialized();
 
-				args.CommandLine.AppendSwitch("enable-experimental-web-platform-features");
+				//This should be enabled on next NanUI version.
+				//args.CommandLine.AppendSwitch("enable-experimental-web-platform-features");
 
 
 				CommandLineHandler?.Invoke(args.CommandLine);

diff --git a/README.md b/README.md
@@ -17,6 +17,9 @@ NanUI is MIT licensed, so you can use it in both business and free/open source a
 - Install Nuget Package of NanUI will add CEF and ChromiumFX dependencies to your application automatically.
 
 ## Changes
+**2018/3/1**
+- 修正：在DEMO程序中添加了app.manifest文件，通过改文件修正demo程序在高分辨率下不正常的问题。
+
 **2018/2/23**
 - 修改：取消了Formium构造函数中的第二个参数，现在窗体强制使用无边框窗体的样式。如果需要使用系统原生窗体，请自行工具箱里添加NetDimension.NanUI.dll中的WebBrowserControl
 - 移除了DEMO中的视频测试功能，服务器压力太大，怕老板找我茬。