Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GTK: make OSD scalable #769

Merged
merged 9 commits into from
Feb 14, 2024
Merged

GTK: make OSD scalable #769

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f2bea21
gtk: make OSD scalable
thesourcehim Feb 1, 2024
ef6eb5f
Merge branch 'master' of https://github.com/thesourcehim/desmume
thesourcehim Feb 1, 2024
ddd8004
Scale save slot indicator (oops), make text outlines look smoother, use
thesourcehim Feb 1, 2024
17509e0
Save and load HUD layout, prefer raster font on low resolution, select
thesourcehim Feb 2, 2024
7252e1c
Build fix
thesourcehim Feb 2, 2024
25a5d68
Add reset HUD layout action, only require fontconfig if libagg is found.
thesourcehim Feb 3, 2024
30979d1
Try another font in case we could not locate monospace
thesourcehim Feb 5, 2024
21cceaf
Detect screen bytes per pixel instead of hardcoding it, define
thesourcehim Feb 13, 2024
7529f6b
Different pixel formats are handled by different draw target
thesourcehim Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions desmume/src/frontend/modules/osd/agg/agg2d.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,6 +1370,17 @@ AGG2D_TEMPLATE void TAGG2D::text(double x, double y, const wchar_t* str, unsigne
}

}

AGG2D_TEMPLATE double TAGG2D::textWidth(const char* str)
{
return textWidth(str, (unsigned int)strlen(str));
}

AGG2D_TEMPLATE void TAGG2D::text(double x, double y, const char* str, bool roundOff, double dx, double dy)
{
text(x, y, str, (unsigned int)strlen(str), roundOff, dx, dy);
}

#endif

//------------------------------------------------------------------------
Expand Down Expand Up @@ -1945,11 +1956,11 @@ AGG2D_TEMPLATE void TAGG2D::render(FontRasterizer& ras, FontScanline& sl)
{
if(m_blendMode == BlendAlpha)
{
Agg2DRenderer::render(*this, m_renBase, m_renSolid, ras, sl);
Agg2DRenderer<PixFormatSet, PixFormatSet>::render(*this, m_renBase, m_renSolid, ras, sl);
}
else
{
Agg2DRenderer::render(*this, m_renBaseComp, m_renSolidComp, ras, sl);
Agg2DRenderer<PixFormatSet, PixFormatSet>::render(*this, m_renBaseComp, m_renSolidComp, ras, sl);
}
}

Expand Down
Loading
Loading