Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-30 00:29:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

servoshell: Port SelectDevice dialog code to use egui instead of tinyfiledialogs (#35657)

Browse source 
Signed-off-by: L Ashwin B <lashwinib@gmail.com>
This commit is contained in:
chickenleaf 2025-02-26 15:29:47 +05:30 • committed by GitHub
parent 0568820f01
commit e956f0c5af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 69 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

41
ports/servoshell/desktop/app_state.rs
View file

@ -503,12 +503,10 @@ impl WebViewDelegate for RunningAppState {
devices: Vec<String>,
response_sender: IpcSender<Option<String>>,
) {
let selected = platform_get_selected_devices(devices);
if let Err(e) = response_sender.send(selected) {
webview.send_error(format!(
"Failed to send GetSelectedBluetoothDevice response: {e}"
));
}
self.add_dialog(
webview,
Dialog::new_device_selection_dialog(devices, response_sender),
);
}
fn show_file_selection_dialog(
@ -583,34 +581,3 @@ impl WebViewDelegate for RunningAppState {
self.inner().window.hide_ime();
}
}
#[cfg(target_os = "linux")]
fn platform_get_selected_devices(devices: Vec<String>) -> Option<String> {
std::thread::Builder::new()
.name("DevicePicker".to_owned())
.spawn(move || {
let dialog_rows: Vec<&str> = devices.iter().map(|s| s.as_ref()).collect();
let dialog_rows: Option<&[&str]> = Some(dialog_rows.as_slice());
match tinyfiledialogs::list_dialog("Choose a device", &["Id", "Name"], dialog_rows) {
Some(device) => {
// The device string format will be "Address|Name". We need the first part of it.
device.split('|').next().map(|s| s.to_string())
},
None => None,
}
})
.unwrap()
.join()
.expect("Thread spawning failed")
}
#[cfg(not(target_os = "linux"))]
fn platform_get_selected_devices(devices: Vec<String>) -> Option<String> {
for device in devices {
if let Some(address) = device.split('|').next().map(|s| s.to_string()) {
return Some(address);
}
}
None
}