Skip to content

More text fixes on iOS/Mac #19227

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

Merged
merged 2 commits into from
Jun 1, 2024
Merged

More text fixes on iOS/Mac #19227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b50443
Simplfication
hrydgard Jun 1, 2024
81c642e
Fix scaling issues in cocoa text drawer
hrydgard Jun 1, 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
6 changes: 3 additions & 3 deletions Common/Math/curves.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ float linearOut(int t, int fadeOutLength) {
}

float ease(float val) {
if (val > 1.0f) return 1.0f;
if (val < 0.0f) return 0.0f;
if (val >= 1.0f) return 1.0f;
if (val <= 0.0f) return 0.0f;
return (float)(((-cosf(val * PI)) + 1.0f) * 0.5);
}

float ease(int t, int fadeLength)
{
if (t < 0) return 0.0f;
if (t <= 0.0f) return 0.0f;
if (t >= fadeLength) return 1.0f;
return ease((float)t / (float)fadeLength);
}
Expand Down
8 changes: 4 additions & 4 deletions Common/Render/Text/draw_text.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ void TextDrawer::DrawString(DrawBuffer &target, std::string_view str, float x, f
draw_->BindTexture(0, entry->texture);

// Okay, the texture is bound, let's draw.
float w = entry->width * fontScaleX_ * dpiScale_;
float h = entry->height * fontScaleY_ * dpiScale_;
float u = entry->width / (float)entry->bmWidth;
float v = entry->height / (float)entry->bmHeight;
float w = (float)entry->width * (fontScaleX_ * dpiScale_);
float h = (float)entry->height * (fontScaleY_ * dpiScale_);
float u = (float)entry->width / (float)entry->bmWidth;
float v = (float)entry->height / (float)entry->bmHeight;
DrawBuffer::DoAlign(align, &x, &y, &w, &h);

target.DrawTexRect(x, y, x + w, y + h, 0.0f, 0.0f, u, v, color);
Expand Down
4 changes: 2 additions & 2 deletions Common/Render/Text/draw_text_cocoa.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ void Destroy() {
float w, h;
MeasureString(str, &w, &h);
// Reverse the DPI scale that MeasureString baked in.
w /= dpiScale_;
h /= dpiScale_;
w /= (dpiScale_ * fontScaleX_);
h /= (dpiScale_ * fontScaleY_);

int width = (int)ceilf(w);
int height = (int)ceilf(h);
Expand Down
4 changes: 1 addition & 3 deletions UI/MiscScreens.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,15 +1041,13 @@ void CreditsScreen::DrawForeground(UIContext &dc) {
float t = (float)(time_now_d() - startTime_) * 60.0;

float y = bounds.y2() - fmodf(t, (float)totalHeight);
std::string line;
for (int i = 0; i < numItems; i++) {
float alpha = linearInOut(y+32, 64, bounds.y2() - 192, 64);
uint32_t textColor = colorAlpha(dc.theme->infoStyle.fgColor, alpha);

if (alpha > 0.0f) {
dc.SetFontScale(ease(alpha), ease(alpha));
line = credits[i];
dc.DrawText(line.c_str(), bounds.centerX(), y, textColor, ALIGN_HCENTER);
dc.DrawText(credits[i], bounds.centerX(), y, textColor, ALIGN_HCENTER);
dc.SetFontScale(1.0f, 1.0f);
}
y += itemHeight;
Expand Down