Skip to content

Fix TextEdit read_only drawing.#110527

Merged
Repiteo merged 1 commit into
godotengine:masterfrom
mounirtohami:text-edit-styles
Oct 1, 2025
Merged

Fix TextEdit read_only drawing.#110527
Repiteo merged 1 commit into
godotengine:masterfrom
mounirtohami:text-edit-styles

Conversation

@WhalesState

@WhalesState WhalesState commented Sep 15, 2025

Copy link
Copy Markdown
Contributor

@WhalesState WhalesState changed the title Fix TextEdit drawing both normal and read_only styles together Fix uneditable TextEdit draws both normal and read_only styles together Sep 15, 2025
@WhalesState

This comment was marked as resolved.

@WhalesState WhalesState marked this pull request as ready for review September 15, 2025 07:24
@WhalesState WhalesState requested a review from a team as a code owner September 15, 2025 07:24
@AThousandShips AThousandShips added bug topic:gui cherrypick:4.5 Considered for cherry-picking into a future 4.5.x release labels Sep 15, 2025
@AThousandShips AThousandShips added this to the 4.6 milestone Sep 15, 2025

@kitbdev kitbdev left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good.

Comment thread scene/gui/text_edit.cpp Outdated
Comment thread scene/gui/text_edit.cpp Outdated
@WhalesState WhalesState force-pushed the text-edit-styles branch 2 times, most recently from a9881bb to 2c2332b Compare September 22, 2025 17:06
@WhalesState WhalesState requested a review from a team as a code owner September 22, 2025 17:06
@WhalesState WhalesState changed the title Fix uneditable TextEdit draws both normal and read_only styles together Fix editor theme scaled margins and TextEdit read_only drawing. Sep 22, 2025
@WhalesState

WhalesState commented Sep 22, 2025

Copy link
Copy Markdown
Contributor Author
Screencast.From.2025-09-22.20-48-12.mp4

@kitbdev

kitbdev commented Sep 22, 2025

Copy link
Copy Markdown
Contributor

I think affecting all editor theme styleboxes is out of scope for this PR that was about the TextEdit readonly style. It was already approved too, I think these new changes would be better in a new PR to be reviewed separately.

@WhalesState WhalesState changed the title Fix editor theme scaled margins and TextEdit read_only drawing. Fix TextEdit read_only drawing. Sep 22, 2025
@WhalesState

WhalesState commented Sep 22, 2025

Copy link
Copy Markdown
Contributor Author

Removed editor theme changes, also removed ceiling the margins which still fixes the text clipping issue but will report minimum size + 1 instead of -1 when left/right margin has values that can be rounded up.

@kitbdev

kitbdev commented Sep 22, 2025

Copy link
Copy Markdown
Contributor

also removed ceiling the margins which still fixes the text clipping issue but will report minimum size + 1 instead of -1 when editor scale is %50 or %150 which is fine for now.

This reverts #105870 so it reintroduces an issue and needs more consideration.
I think it should be a separate change so we can focus on allowing this PR to merge with just the read only change.

Comment thread scene/gui/text_edit.cpp Outdated
@WhalesState

WhalesState commented Sep 22, 2025

Copy link
Copy Markdown
Contributor Author

This reverts #105870 so it reintroduces an issue and needs more consideration. I think it should be a separate change so we can focus on allowing this PR to merge with just the read only change.

@kitbdev

kitbdev commented Sep 23, 2025

Copy link
Copy Markdown
Contributor

Moved the fix here #110791 since the last character clipping was a regression from #105870.

If the fix is moved to another PR, why is #105870 still being reverted here?
I tested and it reopens #105827

@WhalesState

This comment was marked as resolved.

@WhalesState

Copy link
Copy Markdown
Contributor Author

If the fix is moved to another PR, why is #105870 still being reverted here? I tested and it reopens #105827

Fixed by not reverting it in this PR, it should only close the linked issue now without causing any regressions.

@WhalesState WhalesState marked this pull request as ready for review September 24, 2025 17:49
@Repiteo Repiteo merged commit caefb0f into godotengine:master Oct 1, 2025
20 checks passed
@Repiteo

Repiteo commented Oct 1, 2025

Copy link
Copy Markdown
Contributor

Thanks!

@WhalesState WhalesState deleted the text-edit-styles branch October 1, 2025 23:37
@akien-mga akien-mga removed the cherrypick:4.5 Considered for cherry-picking into a future 4.5.x release label Jan 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TextEdit/LineEdit inconsistency when non-editable

5 participants