feat(window_management): add window edge snapping setting
This commit is contained in:
parent
a44071b129
commit
8f9f287db0
2 changed files with 30 additions and 2 deletions
|
|
@ -25,6 +25,7 @@ pub enum Message {
|
||||||
ShowActiveWindowHint(bool),
|
ShowActiveWindowHint(bool),
|
||||||
ShowMaximizeButton(bool),
|
ShowMaximizeButton(bool),
|
||||||
ShowMinimizeButton(bool),
|
ShowMinimizeButton(bool),
|
||||||
|
SetEdgeSnapThreshold(u32),
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Page {
|
pub struct Page {
|
||||||
|
|
@ -36,6 +37,7 @@ pub struct Page {
|
||||||
focus_delay_text: String,
|
focus_delay_text: String,
|
||||||
cursor_follows_focus: bool,
|
cursor_follows_focus: bool,
|
||||||
show_active_hint: bool,
|
show_active_hint: bool,
|
||||||
|
edge_snap_threshold: u32,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Page {
|
impl Default for Page {
|
||||||
|
|
@ -76,6 +78,15 @@ impl Default for Page {
|
||||||
})
|
})
|
||||||
.unwrap_or(true);
|
.unwrap_or(true);
|
||||||
|
|
||||||
|
let edge_snap_threshold = comp_config
|
||||||
|
.get("edge_snap_threshold")
|
||||||
|
.inspect_err(|err| {
|
||||||
|
if !matches!(err, cosmic_config::Error::NoConfigDirectory) {
|
||||||
|
error!(?err, "Failed to read config 'edge_snap_threshold'")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.unwrap_or(0);
|
||||||
|
|
||||||
Page {
|
Page {
|
||||||
super_key_selections: vec![
|
super_key_selections: vec![
|
||||||
fl!("super-key", "launcher"),
|
fl!("super-key", "launcher"),
|
||||||
|
|
@ -90,6 +101,7 @@ impl Default for Page {
|
||||||
focus_delay_text: format!("{focus_follows_cursor_delay}"),
|
focus_delay_text: format!("{focus_follows_cursor_delay}"),
|
||||||
cursor_follows_focus,
|
cursor_follows_focus,
|
||||||
show_active_hint,
|
show_active_hint,
|
||||||
|
edge_snap_threshold,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -168,6 +180,12 @@ impl Page {
|
||||||
error!(?err, "Failed to set config 'active_hint'");
|
error!(?err, "Failed to set config 'active_hint'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Message::SetEdgeSnapThreshold(value) => {
|
||||||
|
self.edge_snap_threshold = value;
|
||||||
|
if let Err(err) = self.comp_config.set("edge_snap_threshold", value) {
|
||||||
|
error!(?err, "Failed to set config 'edge_snap_threshold'");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -179,7 +197,7 @@ impl page::Page<crate::pages::Message> for Page {
|
||||||
sections: &mut SlotMap<section::Entity, Section<crate::pages::Message>>,
|
sections: &mut SlotMap<section::Entity, Section<crate::pages::Message>>,
|
||||||
) -> Option<page::Content> {
|
) -> Option<page::Content> {
|
||||||
Some(vec![
|
Some(vec![
|
||||||
sections.insert(super_key_action()),
|
sections.insert(window_management()),
|
||||||
sections.insert(window_controls()),
|
sections.insert(window_controls()),
|
||||||
sections.insert(focus_navigation()),
|
sections.insert(focus_navigation()),
|
||||||
])
|
])
|
||||||
|
|
@ -197,7 +215,7 @@ impl page::Page<crate::pages::Message> for Page {
|
||||||
|
|
||||||
impl page::AutoBind<crate::pages::Message> for Page {}
|
impl page::AutoBind<crate::pages::Message> for Page {}
|
||||||
|
|
||||||
pub fn super_key_action() -> Section<crate::pages::Message> {
|
pub fn window_management() -> Section<crate::pages::Message> {
|
||||||
let mut descriptions = Slab::new();
|
let mut descriptions = Slab::new();
|
||||||
|
|
||||||
let super_key = descriptions.insert(fl!("super-key"));
|
let super_key = descriptions.insert(fl!("super-key"));
|
||||||
|
|
@ -206,6 +224,8 @@ pub fn super_key_action() -> Section<crate::pages::Message> {
|
||||||
let _applications = descriptions.insert(fl!("super-key", "applications"));
|
let _applications = descriptions.insert(fl!("super-key", "applications"));
|
||||||
let _disable = descriptions.insert(fl!("super-key", "disable"));
|
let _disable = descriptions.insert(fl!("super-key", "disable"));
|
||||||
|
|
||||||
|
let edge_gravity = descriptions.insert(fl!("edge-gravity"));
|
||||||
|
|
||||||
Section::default()
|
Section::default()
|
||||||
.descriptions(descriptions)
|
.descriptions(descriptions)
|
||||||
.view::<Page>(move |_binder, page, section| {
|
.view::<Page>(move |_binder, page, section| {
|
||||||
|
|
@ -220,6 +240,12 @@ pub fn super_key_action() -> Section<crate::pages::Message> {
|
||||||
Message::SuperKey,
|
Message::SuperKey,
|
||||||
)),
|
)),
|
||||||
)
|
)
|
||||||
|
.add(settings::item(
|
||||||
|
&descriptions[edge_gravity],
|
||||||
|
toggler(page.edge_snap_threshold != 0).on_toggle(|is_enabled| {
|
||||||
|
Message::SetEdgeSnapThreshold(if is_enabled { 10 } else { 0 })
|
||||||
|
}),
|
||||||
|
))
|
||||||
.apply(Element::from)
|
.apply(Element::from)
|
||||||
.map(crate::pages::Message::WindowManagement)
|
.map(crate::pages::Message::WindowManagement)
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -302,6 +302,8 @@ super-key = Super key action
|
||||||
.applications = Open Applications
|
.applications = Open Applications
|
||||||
.disable = Disable
|
.disable = Disable
|
||||||
|
|
||||||
|
edge-gravity = Floating windows gravitate to nearby edges
|
||||||
|
|
||||||
window-controls = Window Controls
|
window-controls = Window Controls
|
||||||
.maximize = Show maximize button
|
.maximize = Show maximize button
|
||||||
.minimize = Show minimize button
|
.minimize = Show minimize button
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue