starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-04-24 09:38:32 +02:00
Code Issues 87 Packages Projects Releases 10 Wiki Activity

fix(bar): read mouse follows focus from state

Browse Source
This commit is contained in:
LGUG2Z
2024-09-17 18:09:00 -07:00
parent 6ba0ba79f9
commit 6addfed1ce
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
komorebi-bar/src/date.rs
View File

@@ -117,7 +117,6 @@ impl BarWidget for Date {
} }
} }
// TODO: make spacing configurable
ui.add_space(WIDGET_SPACING); ui.add_space(WIDGET_SPACING);
} }
} }

12
komorebi-bar/src/komorebi.rs
View File

@@ -66,6 +66,7 @@ impl From<KomorebiConfig> for Komorebi {
layout: String::new(), layout: String::new(),
workspaces: vec![], workspaces: vec![],
hide_empty_workspaces: value.workspaces.hide_empty_workspaces, hide_empty_workspaces: value.workspaces.hide_empty_workspaces,
mouse_follows_focus: true,
})), })),
workspaces: value.workspaces, workspaces: value.workspaces,
layout: value.layout, layout: value.layout,
@@ -101,8 +102,12 @@ impl BarWidget for Komorebi {
komorebi_client::send_message(&SocketMessage::MouseFollowsFocus(false)) komorebi_client::send_message(&SocketMessage::MouseFollowsFocus(false))
.unwrap(); .unwrap();
komorebi_client::send_message(&SocketMessage::FocusWorkspaceNumber(i)).unwrap(); komorebi_client::send_message(&SocketMessage::FocusWorkspaceNumber(i)).unwrap();
// TODO: store MFF value from state and restore that here instead of "true" komorebi_client::send_message(&SocketMessage::MouseFollowsFocus(
komorebi_client::send_message(&SocketMessage::MouseFollowsFocus(true)).unwrap(); self.komorebi_notification_state
.borrow()
.mouse_follows_focus,
))
.unwrap();
komorebi_client::send_message(&SocketMessage::Retile).unwrap(); komorebi_client::send_message(&SocketMessage::Retile).unwrap();
} }
} }
@@ -164,6 +169,7 @@ pub struct KomorebiNotificationState {
pub focused_window_icon: Option<RgbaImage>, pub focused_window_icon: Option<RgbaImage>,
pub layout: String, pub layout: String,
pub hide_empty_workspaces: bool, pub hide_empty_workspaces: bool,
pub mouse_follows_focus: bool,
} }
impl KomorebiNotificationState { impl KomorebiNotificationState {
@@ -190,6 +196,8 @@ impl KomorebiNotificationState {
} }
} }
self.mouse_follows_focus = notification.state.mouse_follows_focus;
let monitor = &notification.state.monitors.elements()[monitor_index]; let monitor = &notification.state.monitors.elements()[monitor_index];
let focused_workspace_idx = monitor.focused_workspace_idx(); let focused_workspace_idx = monitor.focused_workspace_idx();

8
komorebi-bar/src/main.rs
View File

@@ -132,16 +132,16 @@ fn main() -> color_eyre::Result<()> {
let config_path = config_path.unwrap(); let config_path = config_path.unwrap();
let state = serde_json::from_str::<komorebi_client::State>(
&komorebi_client::send_query(&SocketMessage::State).unwrap(),
)?;
let mut viewport_builder = ViewportBuilder::default() let mut viewport_builder = ViewportBuilder::default()
.with_decorations(false) .with_decorations(false)
// .with_transparent(config.transparent) // .with_transparent(config.transparent)
.with_taskbar(false) .with_taskbar(false)
.with_position(Position { x: 0.0, y: 0.0 }) .with_position(Position { x: 0.0, y: 0.0 })
.with_inner_size({ .with_inner_size({
let state = serde_json::from_str::<komorebi_client::State>(
&komorebi_client::send_query(&SocketMessage::State).unwrap(),
)?;
Position { Position {
x: state.monitors.elements()[config.monitor.index].size().right as f32, x: state.monitors.elements()[config.monitor.index].size().right as f32,
y: 20.0, y: 20.0,

1
komorebi-bar/src/time.rs
View File

@@ -108,7 +108,6 @@ impl BarWidget for Time {
} }
} }
// TODO: make spacing configurable
ui.add_space(WIDGET_SPACING); ui.add_space(WIDGET_SPACING);
} }
} }