Added basic profile handling and folders
This commit is contained in:
1 parent
d272adcc4c
commit
d8a9a5bb7d
2 files changed
+484
-2
No files matched your search
+427
-2
@@ -24,6 +24,8 @@ const MENU_PADDING: f32 = 4.0;
|
||||
const TAB_SCROLL_STEP: f32 = 120.0;
|
||||
/// Identifies the tab-strip scrollable for programmatic scrolling.
|
||||
const TAB_SCROLL_ID: Id = Id::new("tab-strip");
|
||||
/// Identifies the new-folder name field so it can be focused when opened.
|
||||
const FOLDER_NAME_INPUT: Id = Id::new("folder-name");
|
||||
|
||||
fn main() -> iced::Result {
|
||||
iced::application(Moorly::default, update, view)
|
||||
@@ -274,6 +276,30 @@ struct ShortcutCapture {
|
||||
error: Option<String>,
|
||||
}
|
||||
|
||||
/// A named group of profiles. Profiles themselves can be added later.
|
||||
#[derive(Debug, Clone)]
|
||||
struct ProfileFolder {
|
||||
name: String,
|
||||
profiles: Vec<String>,
|
||||
expanded: bool,
|
||||
}
|
||||
|
||||
impl ProfileFolder {
|
||||
fn default_folder() -> Self {
|
||||
Self {
|
||||
name: "Ungrouped".to_owned(),
|
||||
profiles: Vec::new(),
|
||||
expanded: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
enum Selection {
|
||||
Folder(usize),
|
||||
Profile { folder: usize, profile: usize },
|
||||
}
|
||||
|
||||
struct Moorly {
|
||||
menu_open: bool,
|
||||
tabs_submenu_open: bool,
|
||||
@@ -284,6 +310,11 @@ struct Moorly {
|
||||
active_tab: Option<Tab>,
|
||||
settings_section: SettingsSection,
|
||||
profile_filter: String,
|
||||
profile_folders: Vec<ProfileFolder>,
|
||||
selected: Option<Selection>,
|
||||
hovered_folder: Option<usize>,
|
||||
add_menu_open: bool,
|
||||
folder_dialog: Option<String>,
|
||||
next_blank_tab: u32,
|
||||
tab_offset: f32,
|
||||
tab_viewport_width: f32,
|
||||
@@ -347,6 +378,11 @@ impl Default for Moorly {
|
||||
active_tab: None,
|
||||
settings_section: SettingsSection::default(),
|
||||
profile_filter: String::new(),
|
||||
profile_folders: vec![ProfileFolder::default_folder()],
|
||||
selected: None,
|
||||
hovered_folder: None,
|
||||
add_menu_open: false,
|
||||
folder_dialog: None,
|
||||
next_blank_tab: 1,
|
||||
tab_offset: 0.0,
|
||||
tab_viewport_width: 0.0,
|
||||
@@ -369,6 +405,17 @@ enum Message {
|
||||
SelectSettingsSection(SettingsSection),
|
||||
ProfileFilterChanged(String),
|
||||
ClearProfileFilter,
|
||||
ToggleAddMenu,
|
||||
CloseAddMenu,
|
||||
ToggleFolder(usize),
|
||||
HoverFolder(Option<usize>),
|
||||
SelectProfile { folder: usize, profile: usize },
|
||||
AddProfile,
|
||||
OpenFolderDialog,
|
||||
FolderNameChanged(String),
|
||||
ConfirmFolder,
|
||||
CancelFolder,
|
||||
Ignore,
|
||||
OpenShortcutCapture(ShortcutAction),
|
||||
CancelShortcut,
|
||||
ClearShortcut(ShortcutAction),
|
||||
@@ -452,6 +499,68 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
|
||||
Message::SelectSettingsSection(section) => state.settings_section = section,
|
||||
Message::ProfileFilterChanged(value) => state.profile_filter = value,
|
||||
Message::ClearProfileFilter => state.profile_filter.clear(),
|
||||
Message::ToggleAddMenu => state.add_menu_open = !state.add_menu_open,
|
||||
Message::CloseAddMenu => state.add_menu_open = false,
|
||||
Message::ToggleFolder(index) => {
|
||||
if let Some(folder) = state.profile_folders.get_mut(index) {
|
||||
folder.expanded = !folder.expanded;
|
||||
}
|
||||
state.selected = Some(Selection::Folder(index));
|
||||
}
|
||||
Message::HoverFolder(folder) => state.hovered_folder = folder,
|
||||
Message::SelectProfile { folder, profile } => {
|
||||
state.selected = Some(Selection::Profile { folder, profile });
|
||||
}
|
||||
Message::AddProfile => {
|
||||
let folder_index = match state.selected {
|
||||
Some(Selection::Folder(index)) => index,
|
||||
Some(Selection::Profile { folder, .. }) => folder,
|
||||
None => 0,
|
||||
};
|
||||
|
||||
if let Some(folder) = state.profile_folders.get_mut(folder_index) {
|
||||
let number = folder.profiles.len() + 1;
|
||||
folder.profiles.push(format!("Profile {number}"));
|
||||
folder.expanded = true;
|
||||
state.selected = Some(Selection::Profile {
|
||||
folder: folder_index,
|
||||
profile: folder.profiles.len() - 1,
|
||||
});
|
||||
}
|
||||
state.add_menu_open = false;
|
||||
}
|
||||
Message::OpenFolderDialog => {
|
||||
state.add_menu_open = false;
|
||||
state.folder_dialog = Some(String::new());
|
||||
return operation::focus(FOLDER_NAME_INPUT);
|
||||
}
|
||||
Message::FolderNameChanged(value) => {
|
||||
if let Some(draft) = state.folder_dialog.as_mut() {
|
||||
*draft = value;
|
||||
}
|
||||
}
|
||||
Message::ConfirmFolder => {
|
||||
let Some(name) = state
|
||||
.folder_dialog
|
||||
.as_deref()
|
||||
.map(str::trim)
|
||||
.filter(|name| !name.is_empty())
|
||||
.map(str::to_owned)
|
||||
else {
|
||||
return Task::none();
|
||||
};
|
||||
|
||||
let index = state.profile_folders.len();
|
||||
state.profile_folders.push(ProfileFolder {
|
||||
name,
|
||||
profiles: Vec::new(),
|
||||
expanded: true,
|
||||
});
|
||||
state.selected = Some(Selection::Folder(index));
|
||||
state.folder_dialog = None;
|
||||
}
|
||||
Message::CancelFolder => state.folder_dialog = None,
|
||||
Message::Ignore => {}
|
||||
Message::OpenShortcutCapture(action) => {
|
||||
state.shortcut_capture = Some(ShortcutCapture {
|
||||
action,
|
||||
@@ -793,7 +902,7 @@ fn profiles_panel(state: &Moorly) -> Element<'_, Message> {
|
||||
.align_y(Alignment::Center)
|
||||
.padding(Padding::ZERO.left(9.0));
|
||||
|
||||
let mut filter = stack![field, search].width(320);
|
||||
let mut filter = stack![field, search].width(Length::Fill);
|
||||
|
||||
if !state.profile_filter.is_empty() {
|
||||
let clear = container(
|
||||
@@ -811,7 +920,224 @@ fn profiles_panel(state: &Moorly) -> Element<'_, Message> {
|
||||
filter = filter.push(clear);
|
||||
}
|
||||
|
||||
filter.into()
|
||||
let add_button = button(
|
||||
row![text("+").size(16), text("Add"), text("▾").size(12)]
|
||||
.spacing(6)
|
||||
.align_y(Alignment::Center),
|
||||
)
|
||||
.on_press(Message::ToggleAddMenu)
|
||||
.padding([6, 10])
|
||||
.style(theme::outlined_option);
|
||||
|
||||
let filter_row = row![filter, add_button]
|
||||
.spacing(12)
|
||||
.align_y(Alignment::Center)
|
||||
.width(Length::Fill);
|
||||
|
||||
let mut list = column![].width(Length::Fill);
|
||||
for (index, folder) in state.profile_folders.iter().enumerate() {
|
||||
if index > 0 {
|
||||
list = list.push(rule::horizontal(1));
|
||||
}
|
||||
list = list.push(profile_folder_row(
|
||||
index,
|
||||
folder,
|
||||
state.selected,
|
||||
state.hovered_folder,
|
||||
));
|
||||
}
|
||||
|
||||
let list = container(scrollable(list).width(Length::Fill).height(Length::Fill))
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.style(theme::settings_frame);
|
||||
|
||||
let base = column![filter_row, list]
|
||||
.spacing(12)
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill);
|
||||
|
||||
let dialog_open = state.folder_dialog.is_some();
|
||||
|
||||
if !state.add_menu_open && !dialog_open {
|
||||
return stack![base].into();
|
||||
}
|
||||
|
||||
// Clicking anywhere outside the open layer dismisses it.
|
||||
let backdrop = mouse_area(
|
||||
container(space::horizontal())
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill),
|
||||
)
|
||||
.on_press(if dialog_open {
|
||||
Message::CancelFolder
|
||||
} else {
|
||||
Message::CloseAddMenu
|
||||
});
|
||||
|
||||
let mut layers = stack![base, backdrop];
|
||||
|
||||
if state.add_menu_open {
|
||||
let menu = container(
|
||||
column![
|
||||
button(
|
||||
row![text("👤").size(14), text("Profile")]
|
||||
.spacing(8)
|
||||
.align_y(Alignment::Center),
|
||||
)
|
||||
.on_press(Message::AddProfile)
|
||||
.width(Length::Fill)
|
||||
.padding([6, 10])
|
||||
.style(button::text),
|
||||
button(
|
||||
row![text("📁").size(14), text("Folder")]
|
||||
.spacing(8)
|
||||
.align_y(Alignment::Center),
|
||||
)
|
||||
.on_press(Message::OpenFolderDialog)
|
||||
.width(Length::Fill)
|
||||
.padding([6, 10])
|
||||
.style(button::text),
|
||||
]
|
||||
.width(Length::Fill),
|
||||
)
|
||||
.width(120)
|
||||
.padding(4)
|
||||
.style(theme::menu);
|
||||
|
||||
// ponytail: fixed offset under the filter row; keep in sync with its height.
|
||||
let menu_layer = container(menu)
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.align_x(Alignment::End)
|
||||
.align_y(Alignment::Start)
|
||||
.padding(Padding::ZERO.top(44.0));
|
||||
|
||||
layers = layers.push(menu_layer);
|
||||
}
|
||||
|
||||
if let Some(draft) = &state.folder_dialog {
|
||||
let dialog = container(
|
||||
column![
|
||||
text("New folder").size(14),
|
||||
text_input("Folder name", draft)
|
||||
.id(FOLDER_NAME_INPUT)
|
||||
.on_input(Message::FolderNameChanged)
|
||||
.on_submit(Message::ConfirmFolder)
|
||||
.padding(6)
|
||||
.style(theme::filter_field)
|
||||
.width(Length::Fill),
|
||||
row![
|
||||
space::horizontal(),
|
||||
button("Cancel")
|
||||
.on_press(Message::CancelFolder)
|
||||
.style(theme::danger_option),
|
||||
button("Add")
|
||||
.on_press_maybe(
|
||||
(!draft.trim().is_empty()).then_some(Message::ConfirmFolder)
|
||||
)
|
||||
.style(theme::positive_option),
|
||||
]
|
||||
.spacing(8),
|
||||
]
|
||||
.spacing(10)
|
||||
.width(Length::Fill),
|
||||
)
|
||||
.width(260)
|
||||
.padding(12)
|
||||
.style(theme::menu);
|
||||
|
||||
// Swallow clicks on the dialog surface so only the backdrop outside it
|
||||
// dismisses the dialog.
|
||||
let dialog = mouse_area(dialog).on_press(Message::Ignore);
|
||||
|
||||
let dialog_layer = container(dialog)
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.align_x(Alignment::Center)
|
||||
.align_y(Alignment::Center);
|
||||
|
||||
layers = layers.push(dialog_layer);
|
||||
}
|
||||
|
||||
layers.into()
|
||||
}
|
||||
|
||||
/// One folder heading followed by its profiles. Clicking the heading toggles
|
||||
/// the profile list; clicking a row selects it.
|
||||
fn profile_folder_row(
|
||||
index: usize,
|
||||
folder: &ProfileFolder,
|
||||
selected: Option<Selection>,
|
||||
hovered: Option<usize>,
|
||||
) -> Element<'_, Message> {
|
||||
let is_selected = selected == Some(Selection::Folder(index));
|
||||
let expanded = folder.expanded;
|
||||
|
||||
let mut heading_content = row![
|
||||
text("📁").size(14),
|
||||
text(folder.name.as_str()).size(14),
|
||||
space::horizontal(),
|
||||
]
|
||||
.spacing(8)
|
||||
.align_y(Alignment::Center)
|
||||
.width(Length::Fill);
|
||||
|
||||
if is_selected || hovered == Some(index) {
|
||||
heading_content = heading_content.push(
|
||||
button(text("⋮").size(16))
|
||||
.on_press(Message::Ignore)
|
||||
.padding([2, 6])
|
||||
.style(button::text),
|
||||
);
|
||||
}
|
||||
|
||||
let heading = button(heading_content)
|
||||
.on_press(Message::ToggleFolder(index))
|
||||
.width(Length::Fill)
|
||||
.padding([8, 10])
|
||||
.style(move |theme, status| {
|
||||
let mut style = theme::selectable_row(theme, status, is_selected);
|
||||
if !expanded {
|
||||
style.text_color = style.text_color.scale_alpha(0.6);
|
||||
}
|
||||
style
|
||||
});
|
||||
|
||||
let heading = mouse_area(heading)
|
||||
.on_enter(Message::HoverFolder(Some(index)))
|
||||
.on_exit(Message::HoverFolder(None));
|
||||
|
||||
let mut rows = column![heading].width(Length::Fill);
|
||||
|
||||
if expanded {
|
||||
for (profile_index, profile) in folder.profiles.iter().enumerate() {
|
||||
let profile_selected = selected
|
||||
== Some(Selection::Profile {
|
||||
folder: index,
|
||||
profile: profile_index,
|
||||
});
|
||||
|
||||
rows = rows.push(
|
||||
button(
|
||||
row![text("👤").size(13), text(profile.as_str()).size(13)]
|
||||
.spacing(8)
|
||||
.align_y(Alignment::Center),
|
||||
)
|
||||
.on_press(Message::SelectProfile {
|
||||
folder: index,
|
||||
profile: profile_index,
|
||||
})
|
||||
.width(Length::Fill)
|
||||
.padding([4, 26])
|
||||
.style(move |theme, status| {
|
||||
theme::selectable_row(theme, status, profile_selected)
|
||||
}),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
rows.into()
|
||||
}
|
||||
|
||||
fn settings_page(state: &Moorly) -> Element<'_, Message> {
|
||||
@@ -1112,6 +1438,11 @@ mod tests {
|
||||
active_tab: None,
|
||||
settings_section: super::SettingsSection::default(),
|
||||
profile_filter: String::new(),
|
||||
profile_folders: vec![super::ProfileFolder::default_folder()],
|
||||
selected: None,
|
||||
hovered_folder: None,
|
||||
add_menu_open: false,
|
||||
folder_dialog: None,
|
||||
next_blank_tab: 1,
|
||||
tab_offset: 0.0,
|
||||
tab_viewport_width: 0.0,
|
||||
@@ -1355,4 +1686,98 @@ mod tests {
|
||||
Some("Ctrl+Shift+Q".to_owned())
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn profiles_start_with_an_ungrouped_map() {
|
||||
let state = state();
|
||||
|
||||
assert_eq!(state.profile_folders.len(), 1);
|
||||
assert_eq!(state.profile_folders[0].name, "Ungrouped");
|
||||
assert!(state.profile_folders[0].profiles.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn add_menu_adds_profiles_and_folders() {
|
||||
let mut state = state();
|
||||
let _ = update(&mut state, Message::ToggleAddMenu);
|
||||
assert!(state.add_menu_open);
|
||||
|
||||
let _ = update(&mut state, Message::AddProfile);
|
||||
assert_eq!(state.profile_folders[0].profiles, vec!["Profile 1".to_owned()]);
|
||||
assert!(!state.add_menu_open);
|
||||
|
||||
let _ = update(&mut state, Message::OpenFolderDialog);
|
||||
assert_eq!(state.folder_dialog.as_deref(), Some(""));
|
||||
|
||||
let _ = update(&mut state, Message::FolderNameChanged("Work".to_owned()));
|
||||
let _ = update(&mut state, Message::ConfirmFolder);
|
||||
|
||||
assert_eq!(state.profile_folders.len(), 2);
|
||||
assert_eq!(state.profile_folders[1].name, "Work");
|
||||
assert!(state.folder_dialog.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cancelling_a_folder_does_not_add_it() {
|
||||
let mut state = state();
|
||||
let _ = update(&mut state, Message::OpenFolderDialog);
|
||||
let _ = update(&mut state, Message::FolderNameChanged("Work".to_owned()));
|
||||
let _ = update(&mut state, Message::CancelFolder);
|
||||
|
||||
assert_eq!(state.profile_folders.len(), 1);
|
||||
assert!(state.folder_dialog.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_folder_names_are_rejected() {
|
||||
let mut state = state();
|
||||
let _ = update(&mut state, Message::OpenFolderDialog);
|
||||
let _ = update(&mut state, Message::FolderNameChanged(" ".to_owned()));
|
||||
let _ = update(&mut state, Message::ConfirmFolder);
|
||||
|
||||
assert_eq!(state.profile_folders.len(), 1);
|
||||
assert!(state.folder_dialog.is_some());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn clicking_a_folder_toggles_its_profiles() {
|
||||
let mut state = state();
|
||||
assert!(state.profile_folders[0].expanded);
|
||||
|
||||
let _ = update(&mut state, Message::ToggleFolder(0));
|
||||
assert!(!state.profile_folders[0].expanded);
|
||||
assert_eq!(state.selected, Some(super::Selection::Folder(0)));
|
||||
|
||||
let _ = update(&mut state, Message::ToggleFolder(0));
|
||||
assert!(state.profile_folders[0].expanded);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn adding_a_profile_opens_its_folder_and_selects_it() {
|
||||
let mut state = state();
|
||||
let _ = update(&mut state, Message::ToggleFolder(0));
|
||||
assert!(!state.profile_folders[0].expanded);
|
||||
|
||||
let _ = update(&mut state, Message::AddProfile);
|
||||
|
||||
assert!(state.profile_folders[0].expanded);
|
||||
assert_eq!(
|
||||
state.selected,
|
||||
Some(super::Selection::Profile {
|
||||
folder: 0,
|
||||
profile: 0,
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn adding_a_folder_selects_it() {
|
||||
let mut state = state();
|
||||
let _ = update(&mut state, Message::OpenFolderDialog);
|
||||
let _ = update(&mut state, Message::FolderNameChanged("Work".to_owned()));
|
||||
let _ = update(&mut state, Message::ConfirmFolder);
|
||||
|
||||
assert_eq!(state.profile_folders[1].name, "Work");
|
||||
assert_eq!(state.selected, Some(super::Selection::Folder(1)));
|
||||
}
|
||||
}
|
||||
@@ -162,6 +162,63 @@ pub fn outlined_option(theme: &Theme, status: button::Status) -> button::Style {
|
||||
}
|
||||
}
|
||||
|
||||
/// Style for a confirming action button (green).
|
||||
pub fn positive_option(theme: &Theme, status: button::Status) -> button::Style {
|
||||
let success = theme.extended_palette().success;
|
||||
filled_option(match status {
|
||||
button::Status::Hovered | button::Status::Pressed => success.strong,
|
||||
_ => success.base,
|
||||
})
|
||||
}
|
||||
|
||||
/// Style for a destructive/cancelling action button (red).
|
||||
pub fn danger_option(theme: &Theme, status: button::Status) -> button::Style {
|
||||
let danger = theme.extended_palette().danger;
|
||||
filled_option(match status {
|
||||
button::Status::Hovered | button::Status::Pressed => danger.strong,
|
||||
_ => danger.base,
|
||||
})
|
||||
}
|
||||
|
||||
fn filled_option(pair: iced::theme::palette::Pair) -> button::Style {
|
||||
button::Style {
|
||||
background: Some(pair.color.into()),
|
||||
text_color: pair.text,
|
||||
border: Border {
|
||||
color: pair.color,
|
||||
width: 1.0,
|
||||
radius: 4.0.into(),
|
||||
},
|
||||
..button::Style::default()
|
||||
}
|
||||
}
|
||||
|
||||
/// Style for a selectable list row; the selected one gets a tinted background.
|
||||
pub fn selectable_row(theme: &Theme, status: button::Status, selected: bool) -> button::Style {
|
||||
if selected {
|
||||
let palette = theme.extended_palette();
|
||||
|
||||
button::Style {
|
||||
background: Some(palette.primary.weak.color.into()),
|
||||
text_color: palette.primary.weak.text,
|
||||
border: Border {
|
||||
radius: 3.0.into(),
|
||||
..Border::default()
|
||||
},
|
||||
..button::Style::default()
|
||||
}
|
||||
} else {
|
||||
let mut style = button::text(theme, status);
|
||||
|
||||
if matches!(status, button::Status::Hovered) {
|
||||
style.background =
|
||||
Some(theme.extended_palette().background.weak.color.into());
|
||||
}
|
||||
|
||||
style
|
||||
}
|
||||
}
|
||||
|
||||
/// Style for filter/text fields: a thicker outline while focused.
|
||||
pub fn filter_field(theme: &Theme, status: text_input::Status) -> text_input::Style {
|
||||
let palette = theme.extended_palette();
|
||||
|
||||
Reference in new issue
Block a user