diff --git a/gui/src/main.rs b/gui/src/main.rs index cf08715..1661afa 100644 --- a/gui/src/main.rs +++ b/gui/src/main.rs @@ -842,6 +842,7 @@ fn AddServerModal(on_save: EventHandler, on_cancel: EventHandler<() .unwrap_or_default() }); let mut password = use_signal(|| String::new()); + let mut address_paste_pending = use_signal(|| false); let mut submit_attempted = use_signal(|| false); let do_save = move |_| { @@ -909,11 +910,17 @@ fn AddServerModal(on_save: EventHandler, on_cancel: EventHandler<() placeholder: "mumble.example.com", pattern: ADDRESS_PATTERN, value: "{address.read()}", + onpaste: move |_| address_paste_pending.set(true), oninput: move |evt| { - let (host, maybe_port) = split_host_port(&evt.value()); - address.set(host); - if let Some(p) = maybe_port { - port.set(p); + if address_paste_pending() { + address_paste_pending.set(false); + let (host, maybe_port) = split_host_port(&evt.value()); + address.set(host); + if let Some(p) = maybe_port { + port.set(p); + } + } else { + address.set(evt.value()); } }, required: true, @@ -993,6 +1000,7 @@ fn EditServerModal( let mut port = use_signal(|| entry.port.to_string()); let mut username = use_signal(|| entry.username.clone()); let mut password = use_signal(|| entry.password.clone().unwrap_or_default()); + let mut address_paste_pending = use_signal(|| false); let do_save = move |_| { let port_num: u16 = port.read().parse().unwrap_or(64738); @@ -1043,11 +1051,17 @@ fn EditServerModal( placeholder: "mumble.example.com", pattern: ADDRESS_PATTERN, value: "{address.read()}", + onpaste: move |_| address_paste_pending.set(true), oninput: move |evt| { - let (host, maybe_port) = split_host_port(&evt.value()); - address.set(host); - if let Some(p) = maybe_port { - port.set(p); + if address_paste_pending() { + address_paste_pending.set(false); + let (host, maybe_port) = split_host_port(&evt.value()); + address.set(host); + if let Some(p) = maybe_port { + port.set(p); + } + } else { + address.set(evt.value()); } }, required: true,