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

For keep the border so we know where TextEdit exists. #4242

Closed
wants to merge 33 commits into from
Closed
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f0b7737
Update memory.rs
rustbasic Mar 23, 2024
3b98d7f
Update epi_integration.rs
rustbasic Mar 23, 2024
af5a7bb
Update memory.rs
rustbasic Mar 23, 2024
7f66b56
Update memory.rs
rustbasic Mar 23, 2024
6396c4a
Update epi_integration.rs
rustbasic Mar 23, 2024
9fe42ff
Merge branch 'emilk:master' into master
rustbasic Mar 25, 2024
d7673fe
Merge branch 'emilk:master' into master
rustbasic Mar 25, 2024
a7edc53
Merge branch 'emilk:master' into master
rustbasic Mar 26, 2024
2432784
Merge branch 'emilk:master' into master
rustbasic Mar 27, 2024
649d2de
Update builder.rs
rustbasic Mar 27, 2024
871315f
Merge branch 'emilk:master' into patch32
rustbasic Mar 27, 2024
1d6140f
Merge branch 'emilk:master' into patch32
rustbasic Mar 28, 2024
fc1291c
Merge branch 'emilk:master' into patch32
rustbasic Mar 29, 2024
5d6bdf2
Merge branch 'emilk:master' into patch32
rustbasic Mar 30, 2024
c0f9499
Merge branch 'emilk:master' into patch32
rustbasic Mar 30, 2024
a6e0574
Merge branch 'emilk:master' into patch32
rustbasic Mar 30, 2024
3fcf84c
Merge branch 'emilk:master' into patch32
rustbasic Mar 31, 2024
c6f1d7f
Merge branch 'emilk:master' into patch32
rustbasic Apr 1, 2024
26a825b
Merge branch 'emilk:master' into patch32
rustbasic Apr 1, 2024
b98a82a
Merge branch 'emilk:master' into patch32
rustbasic Apr 1, 2024
e9cdf3d
Merge branch 'emilk:master' into patch32
rustbasic Apr 2, 2024
48ead29
Merge branch 'emilk:master' into patch32
rustbasic Apr 2, 2024
db0f9b1
Merge branch 'emilk:master' into patch32
rustbasic Apr 3, 2024
6fe0b2e
Merge branch 'emilk:master' into patch32
rustbasic Apr 3, 2024
c7def99
Update builder.rs
rustbasic Apr 4, 2024
9bf1976
Merge branch 'emilk:master' into patch32
rustbasic Apr 5, 2024
fcece95
Merge branch 'emilk:master' into patch32
rustbasic Apr 19, 2024
bb3f33c
Merge branch 'emilk:master' into patch32
rustbasic Apr 21, 2024
615cfc0
Merge branch 'emilk:master' into patch32
rustbasic Apr 22, 2024
45c2f39
Merge branch 'emilk:master' into patch32
rustbasic Apr 22, 2024
1850f68
Merge branch 'emilk:master' into patch32
rustbasic Apr 23, 2024
b8ad89f
Merge branch 'emilk:master' into patch32
rustbasic Apr 26, 2024
9eb2ed5
Merge branch 'emilk:master' into patch32
rustbasic Apr 29, 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
4 changes: 2 additions & 2 deletions crates/egui/src/widgets/text_edit/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ impl<'t> TextEdit<'t> {
frame_rect,
visuals.rounding,
ui.visuals().extreme_bg_color,
visuals.bg_stroke, // TODO(emilk): we want to show something here, or a text-edit field doesn't "pop".
ui.visuals().widgets.noninteractive.bg_stroke, // TODO(emilk): we want to show something here, or a text-edit field doesn't "pop".
)
}
} else {
Expand Down Expand Up @@ -726,7 +726,7 @@ impl<'t> TextEdit<'t> {
)
});
} else if selection_changed {
let cursor_range = cursor_range.unwrap();
let cursor_range = cursor_range.unwrap_or_default();
let char_range =
cursor_range.primary.ccursor.index..=cursor_range.secondary.ccursor.index;
let info = WidgetInfo::text_selection_changed(
Expand Down
Loading