Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

Fix for objc2* 0.3.*

Ilyad963c6c94afd
diff --git a/apps/desktop-gpui/src/platform.rs b/apps/desktop-gpui/src/platform.rs
index d5a7aaf88..3937f3bdc 100644
--- a/apps/desktop-gpui/src/platform.rs
+++ b/apps/desktop-gpui/src/platform.rs
@@ -1085,21 +1085,15 @@ mod mac {
// 16 })`. Tauri's `Effect.WindowBackground` is `NSVisualEffectMaterial`
// `windowBackground` (12) blended behind the window; the radius is
// already covered by the content-view squircle clip above.
- let vibrancy = unsafe { NSVisualEffectView::initWithFrame(mtm.alloc(), bounds) };
- unsafe {
- vibrancy.setMaterial(NSVisualEffectMaterial::WindowBackground);
- vibrancy.setBlendingMode(NSVisualEffectBlendingMode::BehindWindow);
- vibrancy.setState(NSVisualEffectState::FollowsWindowActiveState);
- vibrancy.setAutoresizingMask(
- NSAutoresizingMaskOptions::ViewWidthSizable
- | NSAutoresizingMaskOptions::ViewHeightSizable,
- );
- content_view.addSubview_positioned_relativeTo(
- &vibrancy,
- NSWindowOrderingMode::Below,
- None,
- );
- }
+ let vibrancy = NSVisualEffectView::initWithFrame(mtm.alloc(), bounds);
+ vibrancy.setMaterial(NSVisualEffectMaterial::WindowBackground);
+ vibrancy.setBlendingMode(NSVisualEffectBlendingMode::BehindWindow);
+ vibrancy.setState(NSVisualEffectState::FollowsWindowActiveState);
+ vibrancy.setAutoresizingMask(
+ NSAutoresizingMaskOptions::ViewWidthSizable
+ | NSAutoresizingMaskOptions::ViewHeightSizable,
+ );
+ content_view.addSubview_positioned_relativeTo(&vibrancy, NSWindowOrderingMode::Below, None);
Some(MaterialKind::Vibrancy)
}
@@ -1307,7 +1301,11 @@ mod mac {
pub fn lock_borderless_style(native: &NativeWindow) {
use objc2::{ffi, msg_send, runtime::AnyClass};
- unsafe extern "C" fn guarded_set_style_mask(this: *mut AnyObject, sel: Sel, mask: usize) {
+ unsafe extern "C-unwind" fn guarded_set_style_mask(
+ this: *mut AnyObject,
+ sel: Sel,
+ mask: usize,
+ ) {
let Some(&(_, imp)) = SET_STYLE_MASK_SUPER.get() else {
return;
};
@@ -1320,7 +1318,7 @@ mod mac {
tracing::info!(mask, "kept the main window's borderless style mask");
BORDERLESS_STYLE_MASK
};
- let imp: unsafe extern "C" fn(*mut AnyObject, Sel, usize) =
+ let imp: unsafe extern "C-unwind" fn(*mut AnyObject, Sel, usize) =
unsafe { std::mem::transmute(imp) };
unsafe { imp(this, sel, mask) };
}
@@ -1330,25 +1328,27 @@ mod mac {
let sel = objc2::sel!(setStyleMask:);
let &(installed_on, _) = SET_STYLE_MASK_SUPER.get_or_init(|| {
let superclass = ffi::class_getSuperclass(class.cast());
- let Some(imp) = ffi::method_getImplementation(ffi::class_getInstanceMethod(
- superclass,
- sel.as_ptr(),
- )) else {
+ let Some(imp) =
+ ffi::method_getImplementation(ffi::class_getInstanceMethod(superclass, sel))
+ else {
tracing::warn!(
"no inherited setStyleMask: for the main window style-mask lock"
);
return (0, 0);
};
+
let added = ffi::class_addMethod(
class.cast_mut().cast(),
- sel.as_ptr(),
- Some(std::mem::transmute::<
- unsafe extern "C" fn(*mut AnyObject, Sel, usize),
- unsafe extern "C" fn(),
- >(guarded_set_style_mask)),
- c"v@:Q".as_ptr(),
- );
- if !objc2::runtime::Bool::from_raw(added).as_bool() {
+ sel,
+ std::mem::transmute::<
+ unsafe extern "C-unwind" fn(*mut AnyObject, Sel, usize),
+ objc2::runtime::Imp,
+ >(guarded_set_style_mask),
+ c"v@:Q".as_ptr(), // (void)
+ )
+ .as_bool();
+
+ if !added {
tracing::warn!("could not install the main window style-mask lock");
return (0, 0);
}
@@ -1449,10 +1449,8 @@ mod mac {
apply_fullscreen_overlay_behavior(ns_window);
// `.shadow(false)` in the Tauri builder.
ns_window.setHasShadow(false);
- unsafe {
- ns_window.setAnimationBehavior(objc2_app_kit::NSWindowAnimationBehavior::None);
- ns_window.orderFrontRegardless();
- }
+ ns_window.setAnimationBehavior(objc2_app_kit::NSWindowAnimationBehavior::None);
+ ns_window.orderFrontRegardless();
}
/// The window's raw AppKit frame (bottom-left origin). The dev-restore
@@ -1587,7 +1585,7 @@ mod mac {
/// rebuild and must not steal focus from whatever the user is typing in.
/// Same task-only rule as every other ordering call here.
pub fn order_front_native(native: &NativeWindow) {
- unsafe { native.0.orderFrontRegardless() };
+ native.0.orderFrontRegardless();
rerun_occlusion_handler_after_show(&native.0);
}
diff --git a/apps/desktop-gpui/src/tray.rs b/apps/desktop-gpui/src/tray.rs
index 3e6d9c9e7..1fcc09750 100644
--- a/apps/desktop-gpui/src/tray.rs
+++ b/apps/desktop-gpui/src/tray.rs
@@ -988,7 +988,6 @@ mod mac {
stop_recording,
};
use crate::main_window::{Mode, TargetType};
- use crate::platform;
/// `NSVariableStatusItemLength`.
const NS_VARIABLE_STATUS_ITEM_LENGTH: f64 = -1.0;
@@ -1487,6 +1486,14 @@ mod mac {
}
pub(super) fn start_option_tracking() {
+ // Sync to the real modifier state first; the rows may have been stamped
+ // by a rebuild that ran while Option was still held.
+ let held = current_option();
+ OPTION_HELD.set(held);
+ if let Some(mode) = CURRENT_MODE.get() {
+ apply(mode, held);
+ }
+
OPTION_TIMER.with(|slot| {
if slot.borrow().is_some() {
return;