Add favorite limit settings
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
use ely_browser_core::BrowserSnapshot;
|
||||
use ely_design_system::colors;
|
||||
use ely_domain::{ArchivePolicy, Space};
|
||||
use ely_domain::{ArchivePolicy, FavoriteLimit, Space};
|
||||
use gpui::{AnyElement, Context, IntoElement, ParentElement, Styled, div, px, rgb};
|
||||
use gpui_component::{
|
||||
IconName, Selectable, Sizable, StyledExt,
|
||||
@@ -65,7 +65,7 @@ impl ElyShell {
|
||||
.flex_col()
|
||||
.gap_5()
|
||||
.child(render_sidebar_tabs_header(snapshot, active_space))
|
||||
.child(render_archive_policy_panel(active_space, cx)),
|
||||
.child(render_sidebar_tabs_settings(snapshot, active_space, cx)),
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -102,12 +102,20 @@ fn render_sidebar_tabs_header(snapshot: &BrowserSnapshot, active_space: &Space)
|
||||
.font_semibold()
|
||||
.text_color(rgb(colors::MUTED))
|
||||
.child(IconName::LayoutDashboard)
|
||||
.child(archive_policy_label(active_space.archive_policy())),
|
||||
.child(format!(
|
||||
"{} / {}",
|
||||
archive_policy_label(active_space.archive_policy()),
|
||||
snapshot.favorite_limit.label()
|
||||
)),
|
||||
)
|
||||
.into_any_element()
|
||||
}
|
||||
|
||||
fn render_archive_policy_panel(active_space: &Space, cx: &mut Context<ElyShell>) -> AnyElement {
|
||||
fn render_sidebar_tabs_settings(
|
||||
snapshot: &BrowserSnapshot,
|
||||
active_space: &Space,
|
||||
cx: &mut Context<ElyShell>,
|
||||
) -> AnyElement {
|
||||
div()
|
||||
.flex_1()
|
||||
.min_h_0()
|
||||
@@ -118,6 +126,16 @@ fn render_archive_policy_panel(active_space: &Space, cx: &mut Context<ElyShell>)
|
||||
.flex()
|
||||
.flex_col()
|
||||
.gap_4()
|
||||
.child(render_archive_policy_section(active_space, cx))
|
||||
.child(render_favorite_limit_section(snapshot.favorite_limit, cx))
|
||||
.into_any_element()
|
||||
}
|
||||
|
||||
fn render_archive_policy_section(active_space: &Space, cx: &mut Context<ElyShell>) -> AnyElement {
|
||||
div()
|
||||
.flex()
|
||||
.flex_col()
|
||||
.gap_3()
|
||||
.child(
|
||||
div()
|
||||
.flex()
|
||||
@@ -164,6 +182,57 @@ fn render_archive_policy_panel(active_space: &Space, cx: &mut Context<ElyShell>)
|
||||
.into_any_element()
|
||||
}
|
||||
|
||||
fn render_favorite_limit_section(
|
||||
favorite_limit: FavoriteLimit,
|
||||
cx: &mut Context<ElyShell>,
|
||||
) -> AnyElement {
|
||||
div()
|
||||
.flex()
|
||||
.flex_col()
|
||||
.gap_3()
|
||||
.pt_4()
|
||||
.child(
|
||||
div()
|
||||
.flex()
|
||||
.items_center()
|
||||
.justify_between()
|
||||
.gap_4()
|
||||
.child(
|
||||
div()
|
||||
.min_w_0()
|
||||
.flex()
|
||||
.flex_col()
|
||||
.gap_1()
|
||||
.child(
|
||||
div()
|
||||
.text_sm()
|
||||
.font_semibold()
|
||||
.text_color(rgb(colors::INK))
|
||||
.child("Favorite Limit"),
|
||||
)
|
||||
.child(
|
||||
div()
|
||||
.text_xs()
|
||||
.text_color(rgb(colors::MUTED))
|
||||
.child("Maximum cross-space Favorites visible in the sidebar."),
|
||||
),
|
||||
)
|
||||
.child(
|
||||
div()
|
||||
.text_xs()
|
||||
.font_semibold()
|
||||
.text_color(rgb(colors::MUTED))
|
||||
.child(favorite_limit.label()),
|
||||
),
|
||||
)
|
||||
.children(
|
||||
FavoriteLimit::ALL.iter().copied().enumerate().map(|(index, limit)| {
|
||||
render_favorite_limit_option(index, limit, favorite_limit, cx)
|
||||
}),
|
||||
)
|
||||
.into_any_element()
|
||||
}
|
||||
|
||||
fn render_archive_policy_option(
|
||||
index: usize,
|
||||
option: &'static ArchivePolicyOption,
|
||||
@@ -230,6 +299,71 @@ fn render_archive_policy_option(
|
||||
.into_any_element()
|
||||
}
|
||||
|
||||
fn render_favorite_limit_option(
|
||||
index: usize,
|
||||
limit: FavoriteLimit,
|
||||
active_limit: FavoriteLimit,
|
||||
cx: &mut Context<ElyShell>,
|
||||
) -> AnyElement {
|
||||
let selected = limit == active_limit;
|
||||
let border = if selected { colors::PRIMARY } else { colors::HAIRLINE };
|
||||
|
||||
div()
|
||||
.rounded_md()
|
||||
.border_1()
|
||||
.border_color(rgb(border))
|
||||
.bg(rgb(colors::CANVAS_SOFT))
|
||||
.px_4()
|
||||
.py_3()
|
||||
.flex()
|
||||
.items_center()
|
||||
.justify_between()
|
||||
.gap_4()
|
||||
.child(
|
||||
div()
|
||||
.min_w_0()
|
||||
.flex()
|
||||
.items_center()
|
||||
.gap_3()
|
||||
.child(
|
||||
div().text_color(rgb(policy_icon_color(selected))).child(policy_icon(selected)),
|
||||
)
|
||||
.child(
|
||||
div()
|
||||
.min_w_0()
|
||||
.flex()
|
||||
.flex_col()
|
||||
.gap_1()
|
||||
.child(
|
||||
div()
|
||||
.text_sm()
|
||||
.font_semibold()
|
||||
.text_color(rgb(colors::INK))
|
||||
.child(limit.label()),
|
||||
)
|
||||
.child(
|
||||
div()
|
||||
.text_xs()
|
||||
.truncate()
|
||||
.text_color(rgb(colors::MUTED))
|
||||
.child(limit.detail()),
|
||||
),
|
||||
),
|
||||
)
|
||||
.child(
|
||||
Button::new(("favorite-limit-option", index))
|
||||
.ghost()
|
||||
.xsmall()
|
||||
.selected(selected)
|
||||
.label("Select")
|
||||
.tooltip(limit.label())
|
||||
.on_click(cx.listener(move |shell, _, _, cx| {
|
||||
shell.set_favorite_limit(limit, cx);
|
||||
})),
|
||||
)
|
||||
.into_any_element()
|
||||
}
|
||||
|
||||
fn archive_policy_label(policy: &ArchivePolicy) -> &'static str {
|
||||
match policy {
|
||||
ArchivePolicy::Manual => "Manual",
|
||||
|
||||
@@ -7,8 +7,8 @@ mod splits;
|
||||
|
||||
use ely_browser_core::{BrowserCore, InitialBrowserConfig};
|
||||
use ely_domain::{
|
||||
ArchivePolicy, CommandIntent, DownloadPolicy, HistoryRecordingPolicy, NewTabDestination,
|
||||
ProfileId, SearchEngine, SpaceId, TabId, UrlText,
|
||||
ArchivePolicy, CommandIntent, DownloadPolicy, FavoriteLimit, HistoryRecordingPolicy,
|
||||
NewTabDestination, ProfileId, SearchEngine, SpaceId, TabId, UrlText,
|
||||
};
|
||||
use gpui::{App, AppContext, Context, Entity, FocusHandle, Focusable, Subscription, Window};
|
||||
use gpui_component::input::{InputEvent, InputState, SelectAll};
|
||||
@@ -310,6 +310,13 @@ impl ElyShell {
|
||||
}
|
||||
}
|
||||
|
||||
fn set_favorite_limit(&mut self, favorite_limit: FavoriteLimit, cx: &mut Context<Self>) {
|
||||
if let ShellState::Ready(core) = &mut self.state {
|
||||
core.set_favorite_limit(favorite_limit);
|
||||
cx.notify();
|
||||
}
|
||||
}
|
||||
|
||||
fn archive_idle_tabs_now(&mut self, cx: &mut Context<Self>) {
|
||||
if let ShellState::Ready(core) = &mut self.state
|
||||
&& core.archive_idle_tabs(std::time::SystemTime::now()).is_ok()
|
||||
|
||||
Reference in New Issue
Block a user