X Tutup
Skip to content

DIRECTOR: Implement text line height#6480

Merged
sev- merged 2 commits intoscummvm:masterfrom
rinevard:director-lineheight
Mar 18, 2025
Merged

DIRECTOR: Implement text line height#6480
sev- merged 2 commits intoscummvm:masterfrom
rinevard:director-lineheight

Conversation

@rinevard
Copy link
Contributor

No description provided.

Copy link
Member

@sev- sev- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some adjustments required

Datum castRef = g_lingo->pop();

if (castRef.type != CASTREF) {
warning("Incorrect argument type for lineHeight");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, you should use g_lingo->lingoError() here. Please check other places

Copy link
Contributor Author

@rinevard rinevard Mar 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

b_findEmpty might need be updated as well since it uses warning instead of g_lingo->lingoError()

int TextCastMember::getLineHeight(int line) {
Graphics::MacWidget *target = getWidget();
if (target) {
if (_textType == kTextTypeScrolling) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but making MacTextWindow a subclass of MacText, we will eliminate all of these conditions across the code

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll work on this as my next step.

@rinevard rinevard force-pushed the director-lineheight branch from 5fcb01d to bcfb766 Compare March 12, 2025 13:19
@rinevard rinevard force-pushed the director-lineheight branch from bcfb766 to 89d9c2c Compare March 13, 2025 00:58
@bluegr bluegr added the GSoC Part of a Google Summer of Code project label Mar 15, 2025
@rinevard rinevard requested a review from sev- March 17, 2025 12:10
@rinevard rinevard force-pushed the director-lineheight branch from 89d9c2c to 3976649 Compare March 18, 2025 00:23
@sev-
Copy link
Member

sev- commented Mar 18, 2025

Thank you!

@sev- sev- merged commit 68158a9 into scummvm:master Mar 18, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

GSoC Part of a Google Summer of Code project

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

X Tutup