Skip to content

Fix text clipping introduced by https://github.com/mamedev/mame/pull/14550 #14612

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 3 commits into from
Nov 30, 2025
+19 −4
Merged

Fix text clipping introduced by https://github.com/mamedev/mame/pull/14550 #14612

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d30eb7b
Fix text clipping introduced by https://github.com/mamedev/mame/pull/…
cbrunschen Nov 30, 2025
37b2cb3
Simpler fix: instead of multiplying an int anf a float, whdn stretching
cbrunschen Nov 30, 2025
4f6e93c
c++ style typecast, and unrelated correction for right-aligned txt
happppp Nov 30, 2025
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
23 changes: 19 additions & 4 deletions src/emu/rendlay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3220,7 +3220,12 @@ class layout_element::reel_component : public component

// get the width of the string
s32 width = font->string_width(ourheight / num_shown, 1.0f, m_stopnames[fruit]);
float aspect = width > bounds.width() ? (float) bounds.width() / (float) width : 1.0f;
float aspect = 1.0;
if (width > bounds.width())
{
aspect = float(bounds.width()) / float(width);
width = bounds.width();
}

float curx = bounds.left() + (bounds.width() - width) / 2.0f;

Expand Down Expand Up @@ -3361,7 +3366,12 @@ class layout_element::reel_component : public component
{
// get the width of the string
s32 width = font->string_width(dest.height(), 1.0f, m_stopnames[fruit]);
float aspect = width > bounds.width() ? (float) bounds.width() / (float) width : 1.0f;
float aspect = 1.0;
if (width > bounds.width())
{
aspect = float(bounds.width()) / float(width);
width = bounds.width();
}

float curx = bounds.left();

Expand Down Expand Up @@ -3702,7 +3712,12 @@ void layout_element::component::draw_text(
{
// get the width of the string
s32 width = font.string_width(bounds.height(), 1.0f, str);
float aspect = (align == 3 || width > bounds.width()) ? (float) bounds.width() / (float) width : 1.0f;
float aspect = 1.0;
if (align == 3 || width > bounds.width())
{
aspect = float(bounds.width()) / float(width);
width = bounds.width();
}

// get alignment
float curx;
Expand All @@ -3715,7 +3730,7 @@ void layout_element::component::draw_text(

// right
case 2:
curx = bounds.right() - width;
curx = bounds.left() + bounds.width() - width;
break;

// stretch
Expand Down
Loading