-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
add feature to disable text-to-pixel snapping during layout #5057
Draft
drewmiller
wants to merge
1
commit into
emilk:master
Choose a base branch
from
drewmiller:disable-text-snapping
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
#[cfg(feature = "disable_text_snapping")] | ||
#[test] | ||
fn test_layout_sizes_without_snapping() { | ||
let fonts1_0 = epaint::text::Fonts::new(1.0, 1024, epaint::text::FontDefinitions::default()); | ||
let fonts1_1 = epaint::text::Fonts::new(1.1, 1024, epaint::text::FontDefinitions::default()); | ||
let wrapping = epaint::text::TextWrapping { | ||
max_width: 72.0 * 8.5 - 72.0, | ||
..Default::default() | ||
}; | ||
let mut job = epaint::text::LayoutJob { | ||
wrap: wrapping, | ||
..Default::default() | ||
}; | ||
job.append( | ||
"Hello, epaint! Thanks for the awesome GUI library!", | ||
0.0, | ||
epaint::text::TextFormat { | ||
font_id: epaint::FontId::new(10.0, epaint::FontFamily::Proportional), | ||
color: epaint::Color32::WHITE, | ||
..Default::default() | ||
}, | ||
); | ||
let galley1_0 = fonts1_0.layout_job(job.clone()); | ||
let galley1_1 = fonts1_1.layout_job(job.clone()); | ||
assert_eq!(galley1_0.rect.size(), galley1_1.rect.size()); | ||
} | ||
|
||
#[test] | ||
fn test_layout_sizes_with_snapping() { | ||
let fonts1_0 = epaint::text::Fonts::new(1.0, 1024, epaint::text::FontDefinitions::default()); | ||
let fonts1_1 = epaint::text::Fonts::new(1.1, 1024, epaint::text::FontDefinitions::default()); | ||
let wrapping = epaint::text::TextWrapping { | ||
max_width: 72.0 * 8.5 - 72.0, | ||
..Default::default() | ||
}; | ||
let mut job = epaint::text::LayoutJob { | ||
wrap: wrapping, | ||
..Default::default() | ||
}; | ||
job.append( | ||
"Hello, epaint! Thanks for the awesome GUI library!", | ||
0.0, | ||
epaint::text::TextFormat { | ||
font_id: epaint::FontId::new(10.0, epaint::FontFamily::Proportional), | ||
color: epaint::Color32::WHITE, | ||
..Default::default() | ||
}, | ||
); | ||
let galley1_0 = fonts1_0.layout_job(job.clone()); | ||
let galley1_1 = fonts1_1.layout_job(job.clone()); | ||
assert_ne!(galley1_0.rect.height(), galley1_1.rect.height()); | ||
assert_ne!(galley1_0.rect.width(), galley1_1.rect.width()); | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should be a runtime setting instead
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That makes sense. Let me revise it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To me, it makes the most sense to add this as a field of
LayoutJob
which would default totrue
for snapping. That would allow a user like myself to have, e.g., the UI elements all snap while retaining more granular control over a particular layout job. I'm not sure if adding a Struct field is considered a breaking change, so I'd welcome your thoughts on that. Thanks for a great library @emilk.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think adding it to
LayoutJob
is the right thing yes