diff options
| -rw-r--r-- | src/handlers/xdg_shell.rs | 2 | ||||
| -rw-r--r-- | src/input/mod.rs (renamed from src/input.rs) | 6 | ||||
| -rw-r--r-- | src/input/resize_grab.rs (renamed from src/resize_grab.rs) | 0 | ||||
| -rw-r--r-- | src/input/scroll_tracker.rs (renamed from src/scroll_tracker.rs) | 0 | ||||
| -rw-r--r-- | src/input/swipe_tracker.rs (renamed from src/swipe_tracker.rs) | 0 | ||||
| -rw-r--r-- | src/layout/monitor.rs | 2 | ||||
| -rw-r--r-- | src/layout/workspace.rs | 2 | ||||
| -rw-r--r-- | src/lib.rs | 3 | ||||
| -rw-r--r-- | src/niri.rs | 2 |
9 files changed, 9 insertions, 8 deletions
diff --git a/src/handlers/xdg_shell.rs b/src/handlers/xdg_shell.rs index efaa6dfa..6f36fe8d 100644 --- a/src/handlers/xdg_shell.rs +++ b/src/handlers/xdg_shell.rs @@ -30,10 +30,10 @@ use smithay::{ delegate_kde_decoration, delegate_xdg_decoration, delegate_xdg_foreign, delegate_xdg_shell, }; +use crate::input::resize_grab::ResizeGrab; use crate::input::DOUBLE_CLICK_TIME; use crate::layout::workspace::ColumnWidth; use crate::niri::{PopupGrabState, State}; -use crate::resize_grab::ResizeGrab; use crate::utils::{get_monotonic_time, ResizeEdge}; use crate::window::{InitialConfigureState, ResolvedWindowRules, Unmapped, WindowRef}; diff --git a/src/input.rs b/src/input/mod.rs index ee618068..69650a12 100644 --- a/src/input.rs +++ b/src/input/mod.rs @@ -27,12 +27,16 @@ use smithay::utils::{Logical, Point, SERIAL_COUNTER}; use smithay::wayland::pointer_constraints::{with_pointer_constraint, PointerConstraint}; use smithay::wayland::tablet_manager::{TabletDescriptor, TabletSeatTrait}; +use self::resize_grab::ResizeGrab; use crate::niri::State; -use crate::resize_grab::ResizeGrab; use crate::ui::screenshot_ui::ScreenshotUi; use crate::utils::spawning::spawn; use crate::utils::{center, get_monotonic_time, ResizeEdge}; +pub mod resize_grab; +pub mod scroll_tracker; +pub mod swipe_tracker; + pub const DOUBLE_CLICK_TIME: Duration = Duration::from_millis(400); #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/src/resize_grab.rs b/src/input/resize_grab.rs index 8c761558..8c761558 100644 --- a/src/resize_grab.rs +++ b/src/input/resize_grab.rs diff --git a/src/scroll_tracker.rs b/src/input/scroll_tracker.rs index fc48ef06..fc48ef06 100644 --- a/src/scroll_tracker.rs +++ b/src/input/scroll_tracker.rs diff --git a/src/swipe_tracker.rs b/src/input/swipe_tracker.rs index e4300a72..e4300a72 100644 --- a/src/swipe_tracker.rs +++ b/src/input/swipe_tracker.rs diff --git a/src/layout/monitor.rs b/src/layout/monitor.rs index e12d544a..390abf0c 100644 --- a/src/layout/monitor.rs +++ b/src/layout/monitor.rs @@ -15,10 +15,10 @@ use super::workspace::{ }; use super::{LayoutElement, Options}; use crate::animation::Animation; +use crate::input::swipe_tracker::SwipeTracker; use crate::render_helpers::renderer::NiriRenderer; use crate::render_helpers::RenderTarget; use crate::rubber_band::RubberBand; -use crate::swipe_tracker::SwipeTracker; use crate::utils::{output_size, ResizeEdge}; /// Amount of touchpad movement to scroll the height of one workspace. diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs index 15de11dd..77f10919 100644 --- a/src/layout/workspace.rs +++ b/src/layout/workspace.rs @@ -17,10 +17,10 @@ use super::closing_window::{ClosingWindow, ClosingWindowRenderElement}; use super::tile::{Tile, TileRenderElement}; use super::{InteractiveResizeData, LayoutElement, Options}; use crate::animation::Animation; +use crate::input::swipe_tracker::SwipeTracker; use crate::niri_render_elements; use crate::render_helpers::renderer::NiriRenderer; use crate::render_helpers::RenderTarget; -use crate::swipe_tracker::SwipeTracker; use crate::utils::id::IdCounter; use crate::utils::{output_size, ResizeEdge}; use crate::window::ResolvedWindowRules; @@ -15,10 +15,7 @@ pub mod layout; pub mod niri; pub mod protocols; pub mod render_helpers; -pub mod resize_grab; pub mod rubber_band; -pub mod scroll_tracker; -pub mod swipe_tracker; pub mod ui; pub mod utils; pub mod window; diff --git a/src/niri.rs b/src/niri.rs index 0fa95442..8e907aac 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -100,6 +100,7 @@ use crate::dbus::gnome_shell_screenshot::{NiriToScreenshot, ScreenshotToNiri}; use crate::dbus::mutter_screen_cast::{self, ScreenCastToNiri}; use crate::frame_clock::FrameClock; use crate::handlers::configure_lock_surface; +use crate::input::scroll_tracker::ScrollTracker; use crate::input::{ apply_libinput_settings, mods_with_finger_scroll_binds, mods_with_wheel_binds, TabletData, }; @@ -115,7 +116,6 @@ use crate::render_helpers::renderer::NiriRenderer; use crate::render_helpers::{ render_to_shm, render_to_texture, render_to_vec, shaders, RenderTarget, }; -use crate::scroll_tracker::ScrollTracker; use crate::ui::config_error_notification::ConfigErrorNotification; use crate::ui::exit_confirm_dialog::ExitConfirmDialog; use crate::ui::hotkey_overlay::HotkeyOverlay; |