mirror of
https://github.com/LGUG2Z/komorebi.git
synced 2026-11-17 14:21:22 +01:00
style(macos): format the files the merge of settings3 left unformatted
Pure formatting, no other change: the same rustfmt invocation as the kfm fmt check (nightly rustfmt, edition 2024, komorebi-for-mac/rustfmt.toml) over komorebi-for-mac/komorebi/src/animation/mod.rs and static_config.rs, which the merge took from wip-u-settings3 unformatted. Verified: the check's rustfmt --check over the macOS files passes after it.
This commit is contained in:
1 parent
97c21b9360
commit
219cf65b83
2 files changed
+16
-15
No files matched your search
@@ -1,7 +1,7 @@
|
||||
use crate::core::animation::AnimationStyle;
|
||||
|
||||
pub use prefix::AnimationPrefix;
|
||||
pub use komorebi_config::animation::PerAnimationPrefixConfig;
|
||||
pub use prefix::AnimationPrefix;
|
||||
use std::sync::atomic::AtomicUsize;
|
||||
use std::sync::atomic::Ordering;
|
||||
use std::time::Duration;
|
||||
@@ -20,7 +20,6 @@ pub mod tracks;
|
||||
pub mod transition;
|
||||
pub mod workspace_transition;
|
||||
|
||||
|
||||
pub const DEFAULT_ANIMATION_ENABLED: bool = false;
|
||||
pub const DEFAULT_ANIMATION_STYLE: AnimationStyle = AnimationStyle::Linear;
|
||||
pub const DEFAULT_ANIMATION_DURATION: u64 = 250;
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
use komorebi_settings::shared::AnimationDelta;
|
||||
use komorebi_settings::shared::SharedDelta;
|
||||
use crate::CoreFoundationRunLoop;
|
||||
use crate::DATA_DIR;
|
||||
use crate::DEFAULT_MOUSE_FOLLOWS_FOCUS;
|
||||
@@ -42,6 +40,8 @@ use color_eyre::eyre;
|
||||
use crossbeam_channel::Receiver;
|
||||
use hotwatch::EventKind;
|
||||
use hotwatch::Hotwatch;
|
||||
use komorebi_settings::shared::AnimationDelta;
|
||||
use komorebi_settings::shared::SharedDelta;
|
||||
use komorebi_themes::colour::Colour;
|
||||
use objc2_core_foundation::CFRetained;
|
||||
use objc2_core_foundation::CFRunLoop;
|
||||
@@ -324,12 +324,8 @@ impl From<&WindowManager> for StaticConfig {
|
||||
// border_style: Option::from(STYLE.load()),
|
||||
// border_z_order: None,
|
||||
// border_implementation: Option::from(IMPLEMENTATION.load()),
|
||||
default_workspace_padding: Option::from(
|
||||
crate::settings::workspace_padding(),
|
||||
),
|
||||
default_container_padding: Option::from(
|
||||
crate::settings::container_padding(),
|
||||
),
|
||||
default_workspace_padding: Option::from(crate::settings::workspace_padding()),
|
||||
default_container_padding: Option::from(crate::settings::container_padding()),
|
||||
layout_defaults: {
|
||||
let guard = crate::settings::layout_defaults();
|
||||
if guard.is_empty() {
|
||||
@@ -361,7 +357,9 @@ impl From<&WindowManager> for StaticConfig {
|
||||
// slow_application_identifiers: Option::from(SLOW_APPLICATION_IDENTIFIERS.lock().clone()),
|
||||
// bar_configurations: None,
|
||||
// remove_titlebar_applications: Option::from(NO_TITLEBAR.lock().clone()),
|
||||
floating_window_aspect_ratio: Option::from(crate::settings::floating_window_aspect_ratio()),
|
||||
floating_window_aspect_ratio: Option::from(
|
||||
crate::settings::floating_window_aspect_ratio(),
|
||||
),
|
||||
// window_handling_behaviour: Option::from(WINDOW_HANDLING_BEHAVIOUR.load()),
|
||||
tabbed_applications: None,
|
||||
..Default::default()
|
||||
@@ -792,8 +790,10 @@ impl StaticConfigExt for StaticConfig {
|
||||
let mut value = Self::read(path)?;
|
||||
let mut wm = wm.lock();
|
||||
|
||||
let configs_with_preference: Vec<_> =
|
||||
crate::settings::display_index_preferences().keys().copied().collect();
|
||||
let configs_with_preference: Vec<_> = crate::settings::display_index_preferences()
|
||||
.keys()
|
||||
.copied()
|
||||
.collect();
|
||||
let mut configs_used = Vec::new();
|
||||
|
||||
let mut workspace_matching_rules = WORKSPACE_MATCHING_RULES.lock();
|
||||
@@ -955,8 +955,10 @@ impl StaticConfigExt for StaticConfig {
|
||||
|
||||
value.apply_globals()?;
|
||||
|
||||
let configs_with_preference: Vec<_> =
|
||||
crate::settings::display_index_preferences().keys().copied().collect();
|
||||
let configs_with_preference: Vec<_> = crate::settings::display_index_preferences()
|
||||
.keys()
|
||||
.copied()
|
||||
.collect();
|
||||
let mut configs_used = Vec::new();
|
||||
|
||||
let mut workspace_matching_rules = WORKSPACE_MATCHING_RULES.lock();
|
||||
|
||||
Reference in new issue
Block a user