diff options
| author | Aram Drevekenin <aram@poor.dev> | 2026-03-10 22:47:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-10 22:47:09 +0100 |
| commit | 578a7db7d75025ee5113a829db36ba1e4de98fe3 (patch) | |
| tree | b78b44d050e3b1c8774a5e945394f464d163138e /default-plugins/layout-manager/src/ui | |
| parent | Web security hardening (#4830) (diff) | |
| download | sl0ppij-578a7db7d75025ee5113a829db36ba1e4de98fe3.tar.gz sl0ppij-578a7db7d75025ee5113a829db36ba1e4de98fe3.tar.xz sl0ppij-578a7db7d75025ee5113a829db36ba1e4de98fe3.zip | |
Layout manager ux fixes (#4831)
* close self after applying and rename tab as layout
* general ui/ux fixes
* change session manager title on startup
* add pr
Diffstat (limited to 'default-plugins/layout-manager/src/ui')
| -rw-r--r-- | default-plugins/layout-manager/src/ui/layout_table.rs | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/default-plugins/layout-manager/src/ui/layout_table.rs b/default-plugins/layout-manager/src/ui/layout_table.rs index 2f22f06e..3f42a8da 100644 --- a/default-plugins/layout-manager/src/ui/layout_table.rs +++ b/default-plugins/layout-manager/src/ui/layout_table.rs @@ -184,9 +184,10 @@ impl Controls { } fn get_typing_filter_controls(&self, max_cols: usize) -> (&str, &[&str]) { - let long_text = "- <Enter> - accept filter"; - let short_text = "<Enter> - accept filter"; - let minimum_text = "<Enter> ..."; + let long_text = + "- <↑↓> Navigate, <Tab> Complete, <Enter> Open, <Ctrl+o> Apply, <Esc> Manage & New"; + let short_text = "<↑↓>/<Tab>/<Enter>/<Ctrl+o>/<Esc> Nav/Complete/Open/Apply/Manage"; + let minimum_text = "<↑↓>/<Tab>/<Enter>/<Ctrl+o> ..."; let text = if max_cols >= long_text.chars().count() { long_text } else if max_cols >= short_text.chars().count() { @@ -194,13 +195,14 @@ impl Controls { } else { minimum_text }; - (text, &["<Enter>"]) + (text, &["<↑↓>", "<Tab>", "<Enter>", "<Ctrl+o>", "<Esc>"]) } fn get_filter_active_controls(&self, max_cols: usize) -> (&str, &[&str]) { - let long_text = "- <Enter> Open, <↓↑> Nav, <e> Edit, <r> Rename, <Del> - Delete"; - let short_text = "<Enter>/<↓↑>/<e>/<r>/<Del> Open/Nav/Edit/Rename/Del"; - let minimum_text = "<Enter>/<↓↑>/<e>/<r>/<Del> ..."; + let long_text = + "- <Enter> Open, <↓↑> Nav, <Ctrl+o> Apply, <e> Edit, <r> Rename, <Del> Delete"; + let short_text = "<Enter>/<↓↑>/<Ctrl+o>/<e>/<r>/<Del> Open/Nav/Apply/Edit/Rename/Del"; + let minimum_text = "<Enter>/<↓↑>/<Ctrl+o>/<e>/<r>/<Del> ..."; let text = if max_cols >= long_text.chars().count() { long_text } else if max_cols >= short_text.chars().count() { @@ -208,13 +210,18 @@ impl Controls { } else { minimum_text }; - (text, &["<Enter>", "<↓↑>", "<e>", "<r>", "<Del>"]) + ( + text, + &["<Enter>", "<↓↑>", "<Ctrl+o>", "<e>", "<r>", "<Del>"], + ) } fn get_default_controls(&self, max_cols: usize) -> (&str, &[&str]) { - let long_text = "- <Enter> Open, <↓↑> Nav, </> Filter, <e> Edit, <r> Rename, <Del> - Del"; - let short_text = "<Enter>/<↓↑>/</>/<e>/<r>/<Del> Open/Nav/Filter/Edit/Rename/Del"; - let minimum_text = "<Enter>/<↓↑>/</>/<e>/<r>/<Del> ..."; + let long_text = + "- <Enter> Open, <↓↑> Nav, </> Search, <Ctrl+o> Apply, <e> Edit, <r> Rename, <Del> Del"; + let short_text = + "<Enter>/<↓↑>/</>/<Ctrl+o>/<e>/<r>/<Del> Open/Nav/Search/Apply/Edit/Rename/Del"; + let minimum_text = "<Enter>/<↓↑>/</>/<Ctrl+o>/<e>/<r>/<Del> ..."; let text = if max_cols >= long_text.chars().count() { long_text } else if max_cols >= short_text.chars().count() { @@ -222,7 +229,10 @@ impl Controls { } else { minimum_text }; - (text, &["<Enter>", "<↓↑>", "</>", "<e>", "<r>", "<Del>"]) + ( + text, + &["<Enter>", "<↓↑>", "</>", "<Ctrl+o>", "<e>", "<r>", "<Del>"], + ) } fn get_basic_controls_text_and_keys(&self, max_cols: usize) -> (&str, &[&str]) { @@ -240,11 +250,11 @@ impl Controls { "more" }; let long_text = format!( - "- <Tab> Override Session Layout, <?> {} options", + "- <Ctrl+o> Override Session Layout, <?> {} options", toggle_word ); - let short_text = format!("<Tab> Override, <?> {} options", toggle_word); - let minimum_text = format!("<Tab>/<?> ..."); + let short_text = format!("<Ctrl+o> Override, <?> {} options", toggle_word); + let minimum_text = format!("<Ctrl+o>/<?> ..."); let text = if max_cols >= long_text.chars().count() { long_text } else if max_cols >= short_text.chars().count() { @@ -252,7 +262,7 @@ impl Controls { } else { minimum_text }; - (text, &["<Tab>", "<?>"]) + (text, &["<Ctrl+o>", "<?>"]) } fn get_new_layout_text_and_keys(&self, max_cols: usize) -> (&str, &[&str]) { |
