Fixing WindowsStore 10 apps to have a 44x44 small logo asset.

With the release of the 1.1 Tools. The small logo size is enforced at 44x44
infosia · Sep 25, 2015 · 280597b · 280597b
1 parent 77d9d3c
commit 280597b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3457,7 +3457,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
     "\t\t\t\tDescription=\"" << targetNameXML << "\"\n"
     "\t\t\t\tBackgroundColor=\"#336699\"\n"
     "\t\t\t\tSquare150x150Logo=\"" << artifactDirXML << "\\Logo.png\"\n"
-    "\t\t\t\tSquare44x44Logo=\"" << artifactDirXML << "\\SmallLogo.png\">\n"
+    "\t\t\t\tSquare44x44Logo=\"" << artifactDirXML <<
+    "\\SmallLogo44x44.png\">\n"
     "\t\t\t\t<uap:SplashScreen"
     " Image=\"" << artifactDirXML << "\\SplashScreen.png\" />\n"
     "\t\t\t</uap:VisualElements>\n"
@@ -3491,6 +3492,14 @@ ::WriteCommonMissingFiles(const std::string& manifestFile)
   (*this->BuildFileStream) << cmVS10EscapeXML(smallLogo) << "\" />\n";
   this->AddedFiles.push_back(smallLogo);
 
+  std::string smallLogo44 = this->DefaultArtifactDir + "/SmallLogo44x44.png";
+  cmSystemTools::CopyAFile(templateFolder + "/SmallLogo44x44.png",
+                           smallLogo44, false);
+  this->ConvertToWindowsSlash(smallLogo44);
+  this->WriteString("<Image Include=\"", 2);
+  (*this->BuildFileStream) << cmVS10EscapeXML(smallLogo44) << "\" />\n";
+  this->AddedFiles.push_back(smallLogo44);
+
   std::string logo = this->DefaultArtifactDir + "/Logo.png";
   cmSystemTools::CopyAFile(templateFolder + "/Logo.png",
                            logo, false);

diff --git a/Templates/Windows/SmallLogo44x44.png b/Templates/Windows/SmallLogo44x44.png
diff --git a/Tests/VSWinStorePhone/CMakeLists.txt b/Tests/VSWinStorePhone/CMakeLists.txt
@@ -92,6 +92,7 @@ elseif (NOT "${PLATFORM}" STREQUAL "DESKTOP")
     set(ASSET_FILES ${ASSET_FILES}
     Direct3DApp1/Assets/Logo.png
     Direct3DApp1/Assets/SmallLogo.png
+    Direct3DApp1/Assets/SmallLogo44x44.png
     Direct3DApp1/Assets/SplashScreen.png
     Direct3DApp1/Assets/StoreLogo.png
     )

diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png
diff --git a/Tests/VSWinStorePhone/cmake/Package_vc14.store.appxmanifest.in b/Tests/VSWinStorePhone/cmake/Package_vc14.store.appxmanifest.in
@@ -28,7 +28,7 @@
         Description="@SHORT_NAME@"
         BackgroundColor="#336699"
         Square150x150Logo="Assets/Logo.png"
-        Square44x44Logo="Assets/SmallLogo.png">
+        Square44x44Logo="Assets/SmallLogo44x44.png">
         <uap:SplashScreen Image="Assets/SplashScreen.png" />
       </uap:VisualElements>
     </Application>