starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-07-09 22:52:51 +02:00
Code Issues 87 Packages Projects Releases 11 Wiki Activity

refactor(animation): remove cancel idx decreasing

Browse Source
This commit is contained in:
thearturca
2024-07-23 20:36:18 +03:00
parent 53e3526a3a
commit 84ad947e1f
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
komorebi/src/animation.rs
+1 -1
View File
@@ -438,7 +438,7 @@ impl Animation {
)); ));
} }
let latest_cancel_idx = ANIMATION_MANAGER.lock().end_cancel(self.hwnd); let latest_cancel_idx = ANIMATION_MANAGER.lock().latest_cancel_idx(self.hwnd);
latest_cancel_idx == cancel_idx latest_cancel_idx == cancel_idx
} }
komorebi/src/animation_manager.rs
+8 -11
View File
@@ -8,7 +8,7 @@ pub static ANIMATIONS_IN_PROGRESS: AtomicUsize = AtomicUsize::new(0);
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
struct AnimationState { struct AnimationState {
pub in_progress: bool, pub in_progress: bool,
pub cancelled_count: usize, pub cancel_idx_counter: usize,
} }
#[derive(Debug)] #[derive(Debug)]
@@ -31,7 +31,7 @@ impl AnimationManager {
pub fn is_cancelled(&self, hwnd: isize) -> bool { pub fn is_cancelled(&self, hwnd: isize) -> bool {
if let Some(animation_state) = self.animations.get(&hwnd) { if let Some(animation_state) = self.animations.get(&hwnd) {
animation_state.cancelled_count > 0 animation_state.cancel_idx_counter > 0
} else { } else {
false false
} }
@@ -47,19 +47,16 @@ impl AnimationManager {
pub fn init_cancel(&mut self, hwnd: isize) -> usize { pub fn init_cancel(&mut self, hwnd: isize) -> usize {
if let Some(animation_state) = self.animations.get_mut(&hwnd) { if let Some(animation_state) = self.animations.get_mut(&hwnd) {
animation_state.cancelled_count += 1; animation_state.cancel_idx_counter += 1;
animation_state.cancelled_count animation_state.cancel_idx_counter
} else { } else {
0 0
} }
} }
pub fn end_cancel(&mut self, hwnd: isize) -> usize { pub fn latest_cancel_idx(&mut self, hwnd: isize) -> usize {
if let Some(animation_state) = self.animations.get_mut(&hwnd) { if let Some(animation_state) = self.animations.get_mut(&hwnd) {
let cancelled_count = animation_state.cancelled_count; animation_state.cancel_idx_counter
animation_state.cancelled_count -= 1;
cancelled_count
} else { } else {
0 0
} }
@@ -75,7 +72,7 @@ impl AnimationManager {
if let Entry::Vacant(e) = self.animations.entry(hwnd) { if let Entry::Vacant(e) = self.animations.entry(hwnd) {
e.insert(AnimationState { e.insert(AnimationState {
in_progress: true, in_progress: true,
cancelled_count: 0, cancel_idx_counter: 0,
}); });
ANIMATIONS_IN_PROGRESS.store(self.animations.len(), Ordering::Release); ANIMATIONS_IN_PROGRESS.store(self.animations.len(), Ordering::Release);
@@ -91,7 +88,7 @@ impl AnimationManager {
if let Some(animation_state) = self.animations.get_mut(&hwnd) { if let Some(animation_state) = self.animations.get_mut(&hwnd) {
animation_state.in_progress = false; animation_state.in_progress = false;
if animation_state.cancelled_count == 0 { if animation_state.cancel_idx_counter == 0 {
self.animations.remove(&hwnd); self.animations.remove(&hwnd);
ANIMATIONS_IN_PROGRESS.store(self.animations.len(), Ordering::Release); ANIMATIONS_IN_PROGRESS.store(self.animations.len(), Ordering::Release);
} }