dnrops
/
xilem
mirror of https://github.com/linebender/xilem
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the handling of textbox width (#275) 

Previously, filling up the line would overflow the right border of the
box, because the `max_advance` was too big.

This improves the margin hack, and also fixes the resultant issue.

---------

Co-authored-by: Bruce Mitchener <bruce.mitchener@gmail.com>
This commit is contained in:
Daniel McNab 2024-05-07 06:08:50 +01:00 committed by GitHub
parent c3783ae693
commit 47804206b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/masonry/src/widget/textbox.rs
View File

@ -22,7 +22,13 @@ use crate::{
use super::{LineBreaking, WidgetMut, WidgetRef};
const TEXTBOX_PADDING: f64 = 4.0;
const TEXTBOX_PADDING: f64 = 3.0;
/// HACK: A "margin" which is placed around the outside of all textboxes, ensuring that
/// they do not fill the entire width of the window
///
/// In theory, this should be proper margin/padding in the parent widget, but that hasn't been
/// designed.
const TEXTBOX_MARGIN: f64 = 8.0;
/// The textbox widget is a widget which shows text which can be edited by the user
///
@ -148,7 +154,7 @@ impl Widget for Textbox {
fn on_pointer_event(&mut self, ctx: &mut EventCtx, event: &PointerEvent) {
let window_origin = ctx.widget_state.window_origin();
let inner_origin = Point::new(
window_origin.x + TEXTBOX_PADDING,
window_origin.x + TEXTBOX_PADDING + TEXTBOX_MARGIN,
window_origin.y + TEXTBOX_PADDING,
);
match event {
@ -249,8 +255,7 @@ impl Widget for Textbox {
let max_advance = if self.line_break_mode != LineBreaking::WordWrap {
None
} else if bc.max().width.is_finite() {
// TODO: Does Prose have different needs here?
Some(bc.max().width as f32 - 2. * TEXTBOX_PADDING as f32)
Some((bc.max().width - 2. * TEXTBOX_PADDING - 2. * TEXTBOX_MARGIN) as f32)
} else if bc.min().width.is_sign_negative() {
Some(0.0)
} else {
@ -265,7 +270,7 @@ impl Widget for Textbox {
let label_size = Size {
height: text_size.height + 2. * TEXTBOX_PADDING,
// TODO: Better heuristic here?
width: bc.max().width - 20.,
width: bc.max().width - 2. * TEXTBOX_MARGIN,
};
let size = bc.constrain(label_size);
trace!(