Merge pull request #15 from tr1xem/macos
Final Notification Fix
This commit was merged in pull request #15.
This commit is contained in:
2 files changed
+28
-13
No files matched your search
@@ -7,7 +7,7 @@
|
|||||||
/* inset 0 0 0 0.5px alpha(#aaa, 0.4); */
|
/* inset 0 0 0 0.5px alpha(#aaa, 0.4); */
|
||||||
border-radius: 20px;
|
border-radius: 20px;
|
||||||
margin: 4px;
|
margin: 4px;
|
||||||
transition: all 0.25s cubic-bezier(0.25, 0.46, 0.45, 0.94);
|
/* transition: all 0.25s cubic-bezier(0.25, 0.46, 0.45, 0.94); */
|
||||||
}
|
}
|
||||||
|
|
||||||
#notification-action-buttons button.start-action {
|
#notification-action-buttons button.start-action {
|
||||||
|
|||||||
+27
-12
@@ -25,6 +25,7 @@ class AnimationManager:
|
|||||||
# Use 120 FPS for ultra-smooth animations like macOS
|
# Use 120 FPS for ultra-smooth animations like macOS
|
||||||
self._timer_id = GLib.timeout_add(8, self._animate_all) # 120 FPS
|
self._timer_id = GLib.timeout_add(8, self._animate_all) # 120 FPS
|
||||||
|
|
||||||
|
|
||||||
def remove_widget(self, widget):
|
def remove_widget(self, widget):
|
||||||
self._animating_widgets.discard(widget)
|
self._animating_widgets.discard(widget)
|
||||||
if not self._animating_widgets and self._timer_id:
|
if not self._animating_widgets and self._timer_id:
|
||||||
@@ -39,7 +40,7 @@ class AnimationManager:
|
|||||||
self._containers_to_redraw.clear()
|
self._containers_to_redraw.clear()
|
||||||
|
|
||||||
widgets_to_remove = []
|
widgets_to_remove = []
|
||||||
|
|
||||||
# Process all animations in a single frame
|
# Process all animations in a single frame
|
||||||
for widget in list(self._animating_widgets):
|
for widget in list(self._animating_widgets):
|
||||||
if not widget._calculate_position():
|
if not widget._calculate_position():
|
||||||
@@ -71,6 +72,7 @@ class AnimationManager:
|
|||||||
"""Keep consistent 120 FPS for macOS-like smoothness"""
|
"""Keep consistent 120 FPS for macOS-like smoothness"""
|
||||||
return 8 # 120 FPS
|
return 8 # 120 FPS
|
||||||
|
|
||||||
|
|
||||||
def _start_timer(self):
|
def _start_timer(self):
|
||||||
interval = self._get_optimal_interval()
|
interval = self._get_optimal_interval()
|
||||||
self._timer_id = GLib.timeout_add(interval, self._animate_all)
|
self._timer_id = GLib.timeout_add(interval, self._animate_all)
|
||||||
@@ -82,35 +84,35 @@ class AnimationManager:
|
|||||||
|
|
||||||
class MacOSEasing:
|
class MacOSEasing:
|
||||||
"""macOS-style easing functions for natural motion"""
|
"""macOS-style easing functions for natural motion"""
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def ease_out_expo(t):
|
def ease_out_expo(t):
|
||||||
"""Exponential ease out - fast start, slow end"""
|
"""Exponential ease out - fast start, slow end"""
|
||||||
return 1 - math.pow(2, -10 * t) if t != 1 else 1
|
return 1 - math.pow(2, -10 * t) if t != 1 else 1
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def ease_in_out_quart(t):
|
def ease_in_out_quart(t):
|
||||||
"""Quartic ease in-out for smooth acceleration/deceleration"""
|
"""Quartic ease in-out for smooth acceleration/deceleration"""
|
||||||
return 8 * t * t * t * t if t < 0.5 else 1 - math.pow(-2 * t + 2, 4) / 2
|
return 8 * t * t * t * t if t < 0.5 else 1 - math.pow(-2 * t + 2, 4) / 2
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def ease_out_back(t):
|
def ease_out_back(t):
|
||||||
"""Back ease out for slight overshoot effect"""
|
"""Back ease out for slight overshoot effect"""
|
||||||
c1 = 1.70158
|
c1 = 1.70158
|
||||||
c3 = c1 + 1
|
c3 = c1 + 1
|
||||||
return 1 + c3 * math.pow(t - 1, 3) + c1 * math.pow(t - 1, 2)
|
return 1 + c3 * math.pow(t - 1, 3) + c1 * math.pow(t - 1, 2)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def ease_out_cubic_bezier(t):
|
def ease_out_cubic_bezier(t):
|
||||||
"""Custom cubic bezier similar to macOS default (0.25, 0.1, 0.25, 1.0)"""
|
"""Custom cubic bezier similar to macOS default (0.25, 0.1, 0.25, 1.0)"""
|
||||||
# Approximation of cubic-bezier(0.25, 0.1, 0.25, 1.0)
|
# Approximation of cubic-bezier(0.25, 0.1, 0.25, 1.0)
|
||||||
return t * t * t * (t * (6 * t - 15) + 10)
|
return t * t * t * (t * (6 * t - 15) + 10)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def ease_in_cubic(t):
|
def ease_in_cubic(t):
|
||||||
"""Cubic ease in for smooth acceleration"""
|
"""Cubic ease in for smooth acceleration"""
|
||||||
return t * t * t
|
return t * t * t
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def ease_out_quint(t):
|
def ease_out_quint(t):
|
||||||
"""Quintic ease out for very smooth deceleration"""
|
"""Quintic ease out for very smooth deceleration"""
|
||||||
@@ -130,8 +132,7 @@ class SlideRevealer(Gtk.Overlay):
|
|||||||
self._start_time = None
|
self._start_time = None
|
||||||
self._show_animation = False
|
self._show_animation = False
|
||||||
self._pending_position = None
|
self._pending_position = None
|
||||||
# Use float for sub-pixel positioning
|
self._current_position = (0.0, 0.0) # Use float for sub-pixel positioning
|
||||||
self._current_position = (0.0, 0.0)
|
|
||||||
self._animation_id = None # Track individual animation instances
|
self._animation_id = None # Track individual animation instances
|
||||||
|
|
||||||
self._fixed = Gtk.Fixed()
|
self._fixed = Gtk.Fixed()
|
||||||
@@ -167,7 +168,16 @@ class SlideRevealer(Gtk.Overlay):
|
|||||||
if self._revealed and not self._animating:
|
if self._revealed and not self._animating:
|
||||||
return
|
return
|
||||||
self._revealed = True
|
self._revealed = True
|
||||||
self._start_animation(show=True)
|
|
||||||
|
# Ensure widget is properly laid out before starting animation
|
||||||
|
if self.get_realized():
|
||||||
|
self._start_animation(show=True)
|
||||||
|
else:
|
||||||
|
# Wait for widget to be realized
|
||||||
|
def on_realize(*_):
|
||||||
|
self._start_animation(show=True)
|
||||||
|
self.disconnect_by_func(on_realize)
|
||||||
|
self.connect("realize", on_realize)
|
||||||
|
|
||||||
def hide(self):
|
def hide(self):
|
||||||
if not self._revealed and not self._animating:
|
if not self._revealed and not self._animating:
|
||||||
@@ -197,7 +207,12 @@ class SlideRevealer(Gtk.Overlay):
|
|||||||
self._current_position = (float(pos[0]), float(pos[1]))
|
self._current_position = (float(pos[0]), float(pos[1]))
|
||||||
self._fixed.move(self.child, int(pos[0]), int(pos[1]))
|
self._fixed.move(self.child, int(pos[0]), int(pos[1]))
|
||||||
|
|
||||||
AnimationManager.get_instance().add_widget(self)
|
def start_with_dimensions():
|
||||||
|
AnimationManager.get_instance().add_widget(self)
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Use idle_add to ensure layout is complete
|
||||||
|
GLib.idle_add(start_with_dimensions)
|
||||||
|
|
||||||
def _calculate_position(self):
|
def _calculate_position(self):
|
||||||
if not self._animating:
|
if not self._animating:
|
||||||
@@ -302,4 +317,4 @@ class SlideRevealer(Gtk.Overlay):
|
|||||||
|
|
||||||
def destroy(self):
|
def destroy(self):
|
||||||
self.stop_animation()
|
self.stop_animation()
|
||||||
super().destroy()
|
super().destroy()
|
||||||
Reference in new issue
Block a user