Merge pull request #2772 from 21pages/fix

adjust server setting ui

flutter/lib/desktop/pages/desktop_setting_page.dart

@@ -1460,6 +1460,8 @@ _LabeledTextField(
             enabled: enabled,
             obscureText: secure,
             decoration: InputDecoration(
+                isDense: true,
+                contentPadding: EdgeInsets.symmetric(vertical: 15),
                 errorText: errorText.isNotEmpty ? errorText : null),
             style: TextStyle(
               color: _disabledTextColor(context, enabled),

src/platform/linux.rs

@@ -4,6 +4,7 @@ use hbb_common::{allow_err, bail, log};
 use libc::{c_char, c_int, c_void};
 use std::{
     cell::RefCell,
+    collections::HashMap,
     path::PathBuf,
     sync::{
         atomic::{AtomicBool, Ordering},
@@ -719,47 +720,38 @@ pub fn get_double_click_time() -> u32 {
 
 /// forever: may not work
 pub fn system_message(title: &str, msg: &str, forever: bool) -> ResultType<()> {
-    if std::process::Command::new("notify-send")
+    let cmds: HashMap<&str, Vec<&str>> = HashMap::from([
-        .arg(title)
+        ("notify-send", [title, msg].to_vec()),
-        .arg(msg)
+        (
-        .spawn()
+            "zenity",
-        .is_ok()
+            [
-    {
+                "--info",
+                "--timeout",
+                if forever { "0" } else { "3" },
+                "--title",
+                title,
+                "--text",
+                msg,
+            ]
+            .to_vec(),
+        ),
+        ("kdialog", ["--title", title, "--msgbox", msg].to_vec()),
+        (
+            "xmessage",
+            [
+                "-center",
+                "-timeout",
+                if forever { "0" } else { "3" },
+                title,
+                msg,
+            ]
+            .to_vec(),
+        ),
+    ]);
+    for (k, v) in cmds {
+        if std::process::Command::new(k).args(v).spawn().is_ok() {
             return Ok(());
         }
-    if std::process::Command::new("zenity")
-        .arg("--info")
-        .arg("--timeout")
-        .arg(if forever { "0" } else { "3" })
-        .arg("--title")
-        .arg(title)
-        .arg("--text")
-        .arg(msg)
-        .spawn()
-        .is_ok()
-    {
-        return Ok(());
-    }
-    if std::process::Command::new("kdialog")
-        .arg("--title")
-        .arg(title)
-        .arg("--msgbox")
-        .arg(msg)
-        .spawn()
-        .is_ok()
-    {
-        return Ok(());
-    }
-    if std::process::Command::new("xmessage")
-        .arg("-center")
-        .arg("-timeout")
-        .arg(if forever { "0" } else { "3" })
-        .arg(title)
-        .arg(msg)
-        .spawn()
-        .is_ok()
-    {
-        return Ok(());
     }
     bail!("failed to post system message");
 }