Skip to content

Commit

Permalink
First attempt on editbox utf8 fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@not-fl3
not-fl3 committed Sep 1, 2024
1 parent 02e1746 commit da130f7
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 30 deletions.
10 changes: 6 additions & 4 deletions examples/basic_shapes.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ async fn main() {
loop {
clear_background(LIGHTGRAY);

draw_line(40.0, 40.0, 100.0, 200.0, 15.0, BLUE);
draw_rectangle(screen_width() / 2.0 - 60.0, 100.0, 120.0, 60.0, GREEN);
draw_circle(screen_width() - 30.0, screen_height() - 30.0, 15.0, YELLOW);
if is_key_pressed(KeyCode::Q)
&& (is_key_down(KeyCode::LeftControl) || is_key_down(KeyCode::RightControl))
{
println!("ctrl-q")
}

draw_text("HELLO", 20.0, 20.0, 30.0, DARKGRAY);
// draw_text("HELLO", 20.0, 20.0, 30.0, DARKGRAY);

next_frame().await
}
Expand Down
13 changes: 6 additions & 7 deletions src/ui/widgets/editbox.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ impl<'a> Editbox<'a> {
..
} => {
// Don't insert spaces for control characters
if character.is_ascii()
&& !character.is_ascii_control()
if !(character.is_control() || character.is_ascii_control())
&& self.filter.as_ref().map_or(true, |f| f(character))
{
if state.selection.is_some() {
Expand Down Expand Up @@ -240,7 +239,7 @@ impl<'a> Editbox<'a> {
let to_line_end = state.find_line_end(text) as i32;

state.move_cursor(text, to_line_end, modifier_shift);
if text.len() != 0 && state.cursor < text.len() as u32 - 1 {
if text.chars().count() != 0 && state.cursor < text.chars().count() as u32 - 1 {
state.move_cursor(text, 1, modifier_shift);
state.move_cursor_within_line(text, to_line_begin, modifier_shift);
}
Expand Down Expand Up @@ -289,8 +288,8 @@ impl<'a> Editbox<'a> {
*context.clipboard_selection = selected.to_owned();
}
// in case the string was updated outside of editbox
if state.cursor > text.len() as u32 {
state.cursor = text.len() as u32;
if state.cursor > text.chars().count() as u32 {
state.cursor = text.chars().count() as u32;
}

let input_focused =
Expand Down Expand Up @@ -439,12 +438,12 @@ impl<'a> Editbox<'a> {
let cursor_on_current_line =
(context.input.mouse_position.y - (pos.y + y + line_height / 2.)).abs()
< line_height / 2. + 0.1;
let line_end = character == '\n' || n == text.len();
let line_end = character == '\n' || n == text.chars().count();
let cursor_after_line_end = context.input.mouse_position.x > (pos.x + x);
let clickable_character = character != '\n';
let cursor_on_character =
(context.input.mouse_position.x - (pos.x + x)).abs() < advance / 2.;
let last_character = n == text.len();
let last_character = n == text.chars().count();
let cursor_below_line =
(context.input.mouse_position.y - (pos.y + y + line_height)) > 0.;

Expand Down
38 changes: 19 additions & 19 deletions src/ui/widgets/editbox/text_editor.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ impl InsertCharacter {
impl Command for InsertCharacter {
fn apply(&self, text_cursor: &mut u32, text: &mut String) {
*text_cursor = self.cursor;
if self.cursor <= text.len() as u32 {
if self.cursor <= text.chars().count() as u32 {
text.insert(self.cursor as usize, self.character);
}
*text_cursor += 1;
}
fn unapply(&self, text_cursor: &mut u32, text: &mut String) {
*text_cursor = self.cursor;
if self.cursor < text.len() as u32 {
if self.cursor < text.chars().count() as u32 {
text.remove(self.cursor as usize);
}
}
Expand All @@ -50,16 +50,16 @@ impl InsertString {
impl Command for InsertString {
fn apply(&self, text_cursor: &mut u32, text: &mut String) {
*text_cursor = self.cursor;
if self.cursor <= text.len() as u32 {
if self.cursor <= text.chars().count() as u32 {
text.insert_str(self.cursor as usize, &self.data);
}
*text_cursor += self.data.len() as u32;
*text_cursor += self.data.chars().count() as u32;
}

fn unapply(&self, text_cursor: &mut u32, text: &mut String) {
*text_cursor = self.cursor;
if self.cursor < text.len() as u32 {
let end = (self.cursor as usize + self.data.len()).min(text.len());
if self.cursor < text.chars().count() as u32 {
let end = (self.cursor as usize + self.data.chars().count()).min(text.chars().count());

text.replace_range(self.cursor as usize..end, "");
}
Expand All @@ -85,14 +85,14 @@ impl DeleteCharacter {
impl Command for DeleteCharacter {
fn apply(&self, text_cursor: &mut u32, text: &mut String) {
*text_cursor = self.cursor;
if self.cursor < text.len() as u32 {
if self.cursor < text.chars().count() as u32 {
text.remove(self.cursor as usize);
}
}

fn unapply(&self, text_cursor: &mut u32, text: &mut String) {
*text_cursor = self.cursor + 1;
if self.cursor <= text.len() as u32 {
if self.cursor <= text.chars().count() as u32 {
text.insert(self.cursor as usize, self.character);
}
}
Expand All @@ -109,7 +109,7 @@ impl DeleteRange {
let max = start.max(end) as usize;

DeleteRange {
data: text[min..max].to_string(),
data: text.chars().skip(min).take(max - min).collect(),
range: (start, end),
}
}
Expand Down Expand Up @@ -165,11 +165,11 @@ pub struct EditboxState {
impl EditboxState {
pub fn clamp_selection<'a>(&mut self, text: &'a str) {
if let Some((ref mut start, ref mut end)) = &mut self.selection {
if *start >= text.len() as u32 {
*start = text.len() as _;
if *start >= text.chars().count() as u32 {
*start = text.chars().count() as _;
}
if *end >= text.len() as u32 {
*end = text.len() as _;
if *end >= text.chars().count() as u32 {
*end = text.chars().count() as _;
}
}
}
Expand All @@ -180,7 +180,7 @@ impl EditboxState {
let max = start.max(end) as usize;

assert!(min <= max);
assert!(max <= text.len());
assert!(max <= text.chars().count());

Some(&text[min..max])
} else {
Expand All @@ -207,7 +207,7 @@ impl EditboxState {

pub fn find_line_end(&self, text: &str) -> u32 {
let mut cursor_tmp = self.cursor;
while cursor_tmp < text.len() as u32
while cursor_tmp < text.chars().count() as u32
&& text.chars().nth(cursor_tmp as usize).unwrap_or('x') != '\n'
{
cursor_tmp += 1;
Expand Down Expand Up @@ -244,7 +244,7 @@ impl EditboxState {
let mut offset = 0;
let mut space_skipping = false;

while cursor_tmp < text.len() as u32 {
while cursor_tmp < text.chars().count() as u32 {
let current_char = text.chars().nth(cursor_tmp as usize).unwrap_or(' ');
if Self::word_delimiter(current_char) || current_char == '\n' {
space_skipping = true;
Expand Down Expand Up @@ -321,7 +321,7 @@ impl EditboxState {
let start_cursor = self.cursor;
let mut end_cursor = start_cursor;

if self.cursor as i32 + dx <= text.len() as i32 && self.cursor as i32 + dx >= 0 {
if self.cursor as i32 + dx <= text.chars().count() as i32 && self.cursor as i32 + dx >= 0 {
end_cursor = (self.cursor as i32 + dx) as u32;
self.cursor = end_cursor;
}
Expand All @@ -344,7 +344,7 @@ impl EditboxState {

for _ in 0..dx {
if text.chars().nth(self.cursor as usize).unwrap_or('x') == '\n'
|| self.cursor == text.len() as u32
|| self.cursor == text.chars().count() as u32
{
break;
}
Expand All @@ -353,7 +353,7 @@ impl EditboxState {
}

pub fn select_all(&mut self, text: &str) {
self.selection = Some((0, text.len() as u32));
self.selection = Some((0, text.chars().count() as u32));
self.click_state = ClickState::None;
}

Expand Down

0 comments on commit da130f7

Please sign in to comment.