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

Text input should take into account borders and padding when width is… #191

Merged
merged 1 commit into from
Nov 20, 2023
Merged

Text input should take into account borders and padding when width is… #191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 26 additions & 12 deletions src/views/text_input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::action::exec_after;
use crate::keyboard::{self, KeyEvent};
use crate::reactive::{create_effect, RwSignal};
use crate::style::{CursorStyle, TextColor, Width};
use crate::style::{CursorStyle, TextColor};
use crate::style::{FontProps, PaddingLeft};
use crate::unit::{PxPct, PxPctAuto};
use crate::view::ViewData;
Expand Down Expand Up @@ -734,7 +734,7 @@ impl View for TextInput {
if state.downcast::<String>().is_ok() {
cx.request_layout(self.id());
} else {
dbg!("downcast failed");
eprintln!("downcast failed");
}
}

Expand Down Expand Up @@ -825,23 +825,37 @@ impl View for TextInput {
);
}

let text_node = self.text_node.unwrap();

let layout = cx.app_state.get_layout(self.id()).unwrap();
let style = cx.app_state.get_computed_style(self.id());
let style_width = &style.get(Width);
let style = cx.app_state_mut().get_builtin_style(self.id());
let node_width = layout.size.width;

let text_node = self.text_node.unwrap();
let style_width = style.width();
let width_px = match style_width {
crate::unit::PxPctAuto::Px(px) => *px as f32,
crate::unit::PxPctAuto::Pct(pct) => layout.size.width * (*pct as f32),
crate::unit::PxPctAuto::Px(px) => px as f32,
crate::unit::PxPctAuto::Pct(pct) => pct as f32 / 100.0 * node_width,
crate::unit::PxPctAuto::Auto => {
APPROX_VISIBLE_CHARS_TARGET * self.glyph_max_size.width as f32
}
};
self.is_auto_width = matches!(style_width, PxPctAuto::Auto);
self.width = width_px;

let padding_left = match style.padding_left() {
PxPct::Px(padding) => padding as f32,
PxPct::Pct(pct) => pct as f32 / 100.0 * node_width,
};
let padding_right = match style.padding_right() {
PxPct::Px(padding) => padding as f32,
PxPct::Pct(pct) => pct as f32 / 100.0 * node_width,
};
let padding = padding_left + padding_right;
let borders = (style.border_left().0 + style.border_right().0) as f32;

self.width = f32::max(width_px - (padding + borders), 1.0);

let style = Style::new()
.width(width_px)
.width(self.width)
.height(self.height)
.to_taffy_style();
let _ = cx.app_state_mut().taffy.set_style(text_node, style);
Expand Down Expand Up @@ -920,12 +934,12 @@ impl View for TextInput {
let style = cx.app_state.get_computed_style(self.id());

let padding_left = match style.get(PaddingLeft) {
PxPct::Px(padding) => padding as f32,
PxPct::Pct(pct) => pct as f32 * node_layout.size.width,
PxPct::Px(padding) => padding,
PxPct::Pct(pct) => pct / 100.0 * node_width,
};

if cx.app_state.is_focused(&self.id()) {
let selection_rect = self.get_selection_rect(&node_layout, padding_left as f64);
let selection_rect = self.get_selection_rect(&node_layout, padding_left);
cx.fill(
&selection_rect,
cursor_color.unwrap_or(Color::rgba8(0, 0, 0, 150)),
Expand Down