fix minor remaining bugs

macos-click-through
Keith Simmons 3 years ago
parent cb0f92688d
commit b5ff3556fe

@ -91,12 +91,8 @@ impl SerialCommand {
.await .await
.expect("Mouse Scroll Failed"); .expect("Mouse Scroll Failed");
} }
<<<<<<< Updated upstream
UiCommand::Drag {
button,
=======
SerialCommand::Drag { SerialCommand::Drag {
>>>>>>> Stashed changes button,
grid_id, grid_id,
position: (grid_x, grid_y), position: (grid_x, grid_y),
modifier_string, modifier_string,
@ -203,7 +199,7 @@ impl From<ParallelCommand> for UiCommand {
} }
pub fn start_ui_command_handler(running: Arc<AtomicBool>, mut ui_command_receiver: UnboundedReceiver<UiCommand>, nvim: Arc<Neovim<TxWrapper>>) { pub fn start_ui_command_handler(running: Arc<AtomicBool>, mut ui_command_receiver: UnboundedReceiver<UiCommand>, nvim: Arc<Neovim<TxWrapper>>) {
let serial_tx = start_serial_command_handler(running, nvim); let serial_tx = start_serial_command_handler(running.clone(), nvim.clone());
tokio::spawn(async move { tokio::spawn(async move {
loop { loop {
@ -230,7 +226,7 @@ pub fn start_ui_command_handler(running: Arc<AtomicBool>, mut ui_command_receive
} }
pub fn start_serial_command_handler(running: Arc<AtomicBool>, nvim: Arc<Neovim<TxWrapper>>) -> UnboundedSender<SerialCommand> { pub fn start_serial_command_handler(running: Arc<AtomicBool>, nvim: Arc<Neovim<TxWrapper>>) -> UnboundedSender<SerialCommand> {
let (serial_tx, serial_rx) = unbounded_channel::<SerialCommand>(); let (serial_tx, mut serial_rx) = unbounded_channel::<SerialCommand>();
tokio::spawn(async move { tokio::spawn(async move {
loop { loop {
if !running.load(Ordering::Relaxed) { if !running.load(Ordering::Relaxed) {

@ -8,12 +8,8 @@ use glutin::{
}; };
use skia_safe::Rect; use skia_safe::Rect;
<<<<<<< Updated upstream
use super::keyboard_manager::KeyboardManager; use super::keyboard_manager::KeyboardManager;
use crate::bridge::UiCommand;
=======
use crate::bridge::{SerialCommand, UiCommand}; use crate::bridge::{SerialCommand, UiCommand};
>>>>>>> Stashed changes
use crate::channel_utils::LoggingTx; use crate::channel_utils::LoggingTx;
use crate::renderer::{Renderer, WindowDrawDetails}; use crate::renderer::{Renderer, WindowDrawDetails};
@ -166,19 +162,12 @@ impl MouseManager {
// If dragging and we haven't already sent a position, send a drag command // If dragging and we haven't already sent a position, send a drag command
if self.dragging.is_some() && has_moved { if self.dragging.is_some() && has_moved {
self.command_sender self.command_sender
<<<<<<< Updated upstream .send(SerialCommand::Drag {
.send(UiCommand::Drag {
button: self.dragging.as_ref().unwrap().to_owned(), button: self.dragging.as_ref().unwrap().to_owned(),
grid_id: relevant_window_details.id, grid_id: relevant_window_details.id,
position: self.drag_position.into(), position: self.drag_position.into(),
modifier_string: keyboard_manager.format_modifier_string(true), modifier_string: keyboard_manager.format_modifier_string(true),
})
=======
.send(SerialCommand::Drag {
grid_id: relevant_window_details.id,
position: self.drag_position.into(),
}.into()) }.into())
>>>>>>> Stashed changes
.ok(); .ok();
} else { } else {
// otherwise, update the window_id_under_mouse to match the one selected // otherwise, update the window_id_under_mouse to match the one selected
@ -214,22 +203,13 @@ impl MouseManager {
}; };
self.command_sender self.command_sender
<<<<<<< Updated upstream .send(SerialCommand::MouseButton {
.send(UiCommand::MouseButton {
button: button_text.clone(), button: button_text.clone(),
action, action,
grid_id: details.id, grid_id: details.id,
position: position.into(), position: position.into(),
modifier_string: keyboard_manager.format_modifier_string(true), modifier_string: keyboard_manager.format_modifier_string(true),
})
=======
.send(SerialCommand::MouseButton {
button: button_text.to_string(),
action,
grid_id: details.id,
position: position.into(),
}.into()) }.into())
>>>>>>> Stashed changes
.ok(); .ok();
} }
@ -266,12 +246,8 @@ impl MouseManager {
.map(|details| details.id) .map(|details| details.id)
.unwrap_or(0), .unwrap_or(0),
position: self.drag_position.into(), position: self.drag_position.into(),
<<<<<<< Updated upstream
modifier_string: keyboard_manager.format_modifier_string(true), modifier_string: keyboard_manager.format_modifier_string(true),
};
=======
}.into(); }.into();
>>>>>>> Stashed changes
for _ in 0..(new_y - previous_y).abs() { for _ in 0..(new_y - previous_y).abs() {
self.command_sender.send(scroll_command.clone()).ok(); self.command_sender.send(scroll_command.clone()).ok();
} }
@ -296,12 +272,8 @@ impl MouseManager {
.map(|details| details.id) .map(|details| details.id)
.unwrap_or(0), .unwrap_or(0),
position: self.drag_position.into(), position: self.drag_position.into(),
<<<<<<< Updated upstream
modifier_string: keyboard_manager.format_modifier_string(true), modifier_string: keyboard_manager.format_modifier_string(true),
};
=======
}.into(); }.into();
>>>>>>> Stashed changes
for _ in 0..(new_x - previous_x).abs() { for _ in 0..(new_x - previous_x).abs() {
self.command_sender.send(scroll_command.clone()).ok(); self.command_sender.send(scroll_command.clone()).ok();
} }

Loading…
Cancel
Save