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.

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

[iOS] Text alignment in editor - improvements #24859

Merged
merged 6 commits into from
Oct 1, 2024
Merged

Conversation

kubaflo
Copy link
Contributor

@kubaflo kubaflo commented Sep 22, 2024

Description of Change

Currently, text alignment in the editor is not functioning correctly when the editor's scale is adjusted. This Pr fixed this

Issues Fixed

Fixes #24583

Editors with text start, center and end alignments with a scale of 0.5

Before After

@rmarinho
Copy link
Member

/azp run

Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@rmarinho
Copy link
Member

Can we also add a Test without scale ? to make sure that didn t regress>?

@kubaflo
Copy link
Contributor Author

kubaflo commented Sep 23, 2024

@rmarinho sure, and done

@PureWeen PureWeen requested review from tj-devel709 and removed request for jfversluis and mattleibow September 25, 2024 22:23
@PureWeen
Copy link
Member

/azp run

Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@tj-devel709
Copy link
Member

/azp run

Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@tj-devel709
Copy link
Member

@kubaflo This is awesome! Thanks for fixing this issue. I did add a commit bringing some of your new changes to the way it used to be implemented. These changes get touchy with the keyboard scrolling inside editors with the contentInsets and contentOffsets and were failing some UITests. This also brought to my attention that the keyboard scrolling stuff is off when the verticalTextAlignment is Center or End. Let me know if you see issues with the change I made :)

@tj-devel709
Copy link
Member

Link to new issue found when testing this: #24977

@kubaflo
Copy link
Contributor Author

kubaflo commented Sep 28, 2024

@tj-devel709 yay everything works after your commits. Thanks!

@tj-devel709
Copy link
Member

/azp run

Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@tj-devel709
Copy link
Member

/azp run

Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@rmarinho rmarinho merged commit f67dda2 into dotnet:main Oct 1, 2024
97 checks passed
@samhouts samhouts added the fixed-in-net8.0-nightly This may be available in a nightly release! label Oct 1, 2024
@PureWeen
Copy link
Member

PureWeen commented Oct 9, 2024

/backport to release/8.0.1xx-sr9

Copy link
Contributor

github-actions bot commented Oct 9, 2024

Started backporting to release/8.0.1xx-sr9: https://github.com/dotnet/maui/actions/runs/11260987431

Copy link
Contributor

github-actions bot commented Oct 9, 2024

@PureWeen backporting to release/8.0.1xx-sr9 failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: [iOS] Text alignment in editor - improvements
.git/rebase-apply/patch:117: space before tab in indent.
	 	void AlignTextVertically()
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	src/Core/src/Platform/iOS/MauiTextView.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Core/src/Platform/iOS/MauiTextView.cs
CONFLICT (content): Merge conflict in src/Core/src/Platform/iOS/MauiTextView.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 [iOS] Text alignment in editor - improvements
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

github-actions bot commented Oct 9, 2024

@PureWeen an error occurred while backporting to release/8.0.1xx-sr9, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

PureWeen pushed a commit that referenced this pull request Oct 9, 2024
* [iOS] Text alignment in editor - improvements

* Update Issue24583.cs

* Try old way but use content height

* less noise

* Added the first batch of snapshots

* add more screenshots

---------

Co-authored-by: tj-devel709 <[email protected]>
PureWeen added a commit that referenced this pull request Oct 10, 2024
* [iOS] Text alignment in editor - improvements

* Update Issue24583.cs

* Try old way but use content height

* less noise

* Added the first batch of snapshots

* add more screenshots

---------

Co-authored-by: Jakub Florkowski <[email protected]>
Co-authored-by: tj-devel709 <[email protected]>
@samhouts samhouts added the fixed-in-net9.0-nightly This may be available in a nightly release! label Oct 14, 2024
rmarinho pushed a commit that referenced this pull request Oct 16, 2024
* [iOS] Text alignment in editor - improvements

* Update Issue24583.cs

* Try old way but use content height

* less noise

* Added the first batch of snapshots

* add more screenshots

---------

Co-authored-by: tj-devel709 <[email protected]>
rmarinho pushed a commit that referenced this pull request Oct 16, 2024
* [iOS] Text alignment in editor - improvements

* Update Issue24583.cs

* Try old way but use content height

* less noise

* Added the first batch of snapshots

* add more screenshots

---------

Co-authored-by: tj-devel709 <[email protected]>
@github-actions github-actions bot locked and limited conversation to collaborators Nov 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-controls-editor Editor community ✨ Community Contribution fixed-in-net8.0-nightly This may be available in a nightly release! fixed-in-net9.0-nightly This may be available in a nightly release! platform/iOS 🍎
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[iOS, macOS] Text in the Editor control disappeared when reducing the Scale of the Editor control
5 participants