[iOS] Text alignment in editor - improvements #24859
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kubaflo
added
platform/iOS 🍎
area-controls-editor
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
Can we also add a Test without scale ? to make sure that didn t regress>? |
|
@rmarinho sure, and done |
PureWeen
requested review from
tj-devel709
and removed request for
jfversluis and
mattleibow
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
@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 :) |
|
Link to new issue found when testing this: #24977 |
|
@tj-devel709 yay everything works after your commits. Thanks! |
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
tj-devel709
approved these changes
Oct 1, 2024
rmarinho
approved these changes
Oct 1, 2024
samhouts
added
the
fixed-in-net8.0-nightly
|
/backport to release/8.0.1xx-sr9 |
|
Started backporting to release/8.0.1xx-sr9: https://github.com/dotnet/maui/actions/runs/11260987431 |
|
@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 128Please backport manually! |
|
@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 <tj.devel709@gmail.com>
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 <42434498+kubaflo@users.noreply.github.com> Co-authored-by: tj-devel709 <tj.devel709@gmail.com>
samhouts
added
the
fixed-in-net9.0-nightly
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 <tj.devel709@gmail.com>
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 <tj.devel709@gmail.com>
samhouts
added
fixed-in-9.0.12
fixed-in-net8.0-nightly
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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