djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TextEdit widgets are now slightly larger to accommodate their frames

Browse source 
Fixes https://github.com/emilk/egui/issues/89
This commit is contained in:
Emil Ernerfeldt 2021-01-03 16:22:10 +01:00
parent c6a5af19e6
commit 5c8df6925d
2 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed 🐛
* `RepaintSignal` now implements `Sync` so it can be sent to a background thread.
* `TextEdit` widgets are now slightly larger to accommodate their frames.
### Deprecated

41
egui/src/widgets/text_edit.rs
View file

@ -213,6 +213,33 @@ impl<'t> TextEdit<'t> {
impl<'t> Widget for TextEdit<'t> {
fn ui(self, ui: &mut Ui) -> Response {
let margin = Vec2::splat(2.0);
let frame_rect = ui.available_rect_before_wrap();
let content_rect = frame_rect.shrink2(margin);
let where_to_put_background = ui.painter().add(PaintCmd::Noop);
let mut content_ui = ui.child_ui(content_rect, *ui.layout());
let response = self.content_ui(&mut content_ui);
let frame_rect = Rect::from_min_max(frame_rect.min, content_ui.min_rect().max + margin);
let response = response | ui.allocate_response(frame_rect.size(), Sense::click());
let visuals = ui.style().interact(&response);
let frame_rect = response.rect;
ui.painter().set(
where_to_put_background,
PaintCmd::Rect {
rect: frame_rect,
corner_radius: visuals.corner_radius,
fill: ui.style().visuals.dark_bg_color,
stroke: visuals.bg_stroke,
},
);
response
}
}
impl<'t> TextEdit<'t> {
fn content_ui(self, ui: &mut Ui) -> Response {
let TextEdit {
text,
id,
@ -247,7 +274,7 @@ impl<'t> Widget for TextEdit<'t> {
if let Some(id_source) = id_source {
ui.make_persistent_id(id_source)
} else {
auto_id // Since we are only storing the cursor, perfect persistence Id not super important
auto_id // Since we are only storing the cursor a persistent Id is not super important
}
});
let mut state = ui.memory().text_edit.get(&id).cloned().unwrap_or_default();
@ -443,18 +470,6 @@ impl<'t> Widget for TextEdit<'t> {
.feed_state(ui.input().time, &(cursorp.as_ccursorp(), text.clone()));
}
{
let visuals = ui.style().interact(&response);
let bg_rect = response.rect.expand(2.0); // breathing room for content
ui.painter().add(PaintCmd::Rect {
rect: bg_rect,
corner_radius: visuals.corner_radius,
fill: ui.style().visuals.dark_bg_color,
// fill: visuals.bg_fill,
stroke: visuals.bg_stroke,
});
}
if ui.memory().has_kb_focus(id) {
if let Some(cursorp) = state.cursorp {
paint_cursor_selection(ui, response.rect.min, &galley, &cursorp);