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.

Sign up for GitHub

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 expand_bg to text layouting #5365

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add expand_bg to text layouting #5365

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
644c124
Update text_layout.rs
MeGaGiGaGon Nov 12, 2024
1e12afc
Update visuals.rs
MeGaGiGaGon Nov 12, 2024
67d78fa
Add expand_bg and change select defaults
MeGaGiGaGon Nov 12, 2024
1ff763f
Fix formatting lint
MeGaGiGaGon Nov 12, 2024
959187b
Fix RichText not getting the 1.0 default
MeGaGiGaGon Nov 12, 2024
d58881a
Merge branch 'remove-text-bg-expand' of https://github.com/MeGaGiGaGo…
MeGaGiGaGon Nov 12, 2024
d369786
Revert selection color changes
MeGaGiGaGon Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/egui/src/text_selection/visuals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pub fn paint_text_selection(

// Start by appending the selection rectangle to end of the mesh, as two triangles (= 6 indices):
let num_indices_before = mesh.indices.len();
mesh.add_colored_rect(rect, color);
mesh.add_colored_rect(rect, color.gamma_multiply(0.5));
MeGaGiGaGon marked this conversation as resolved.
Show resolved Hide resolved
assert_eq!(num_indices_before + 6, mesh.indices.len());

// Copy out the new triangles:
Expand Down
1 change: 0 additions & 1 deletion crates/epaint/src/text/text_layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,6 @@ fn add_row_backgrounds(job: &LayoutJob, row: &Row, mesh: &mut Mesh) {
let mut end_run = |start: Option<(Color32, Rect)>, stop_x: f32| {
if let Some((color, start_rect)) = start {
let rect = Rect::from_min_max(start_rect.left_top(), pos2(stop_x, start_rect.bottom()));
let rect = rect.expand(1.0); // looks better
mesh.add_colored_rect(rect, color);
}
};
Expand Down
Loading