Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

UWP: Fix missing font file causing missing text fields. Fixes #15771

Browse Source
This commit is contained in:
Henrik Rydgård 2022-08-04 10:44:12 +02:00
parent c3324c872f
commit e7e1bb6079
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/UI/View.cpp
View File

@ -1046,7 +1046,7 @@ void TextEdit::Draw(UIContext &dc) {
}
void TextEdit::GetContentDimensions(const UIContext &dc, float &w, float &h) const {
dc.MeasureText(dc.theme->uiFont, 1.0f, 1.0f, text_.size() ? text_.c_str() : "Wj", &w, &h, align_);
dc.MeasureText(dc.theme->uiFont, 1.0f, 1.0f, !text_.empty() ? text_.c_str() : "Wj", &w, &h, align_);
w += 2;
h += 2;
}

11
UWP/UWP.vcxproj
View File

@ -184,14 +184,14 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<PackageCertificateKeyFile>PPSSPP_UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
<AppxBundle>Never</AppxBundle>
<PackageCertificateThumbprint>b5e422213fb26042db3327f1102c4f9b86c27b1c</PackageCertificateThumbprint>
<PackageCertificateThumbprint>169879A9D7A20F22B0DD435921035E3E6D5996A4</PackageCertificateThumbprint>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Link>
@ -596,6 +596,13 @@
<DeploymentContent>true</DeploymentContent>
<FileType>Document</FileType>
</Image>
<Image Include="Content\asciifont_atlas.zim">
<DeploymentContent>true</DeploymentContent>
<FileType>Document</FileType>
</Image>
<None Include="Content\asciifont_atlas.meta">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\assets\ppge_atlas.meta">
<DeploymentContent>true</DeploymentContent>
</None>

15
UWP/UWP.vcxproj.filters
View File

@ -88,9 +88,6 @@
<Image Include="Content\7z.png">
<Filter>Content</Filter>
</Image>
<Image Include="Content\rargray.png">
<Filter>Content</Filter>
</Image>
<Image Include="Content\unknown.png">
<Filter>Content</Filter>
</Image>
@ -103,12 +100,17 @@
<Image Include="AssetsGold\StoreLogo.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Content\rargray.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Content\asciifont_atlas.zim">
<Filter>Content</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest" />
</ItemGroup>
<ItemGroup>
<None Include="UWP_TemporaryKey.pfx" />
<None Include="Content\compat.ini">
<Filter>Content</Filter>
</None>
@ -365,6 +367,9 @@
<None Include="..\assets\themes\defaultthemes.ini">
<Filter>Content\themes</Filter>
</None>
<None Include="Content\asciifont_atlas.meta">
<Filter>Content</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Text Include="Content\gamecontrollerdb.txt">
@ -376,4 +381,4 @@
<Filter>Content</Filter>
</Font>
</ItemGroup>
</Project>
</Project>