Checkpoint

This commit is contained in:
Nathan Sobo 2023-09-20 10:17:29 -06:00
parent 7885eaf974
commit 83dae46ec6
17 changed files with 2701 additions and 1193 deletions

View file

@ -1,6 +1,6 @@
use super::{
event::key_to_native, screen::Screen, status_item::StatusItem, BoolExt as _, Dispatcher,
FontSystem, MacWindow,
MacWindow, TextSystem,
};
use crate::{
executor,
@ -488,7 +488,7 @@ impl platform::ForegroundPlatform for MacForegroundPlatform {
pub struct MacPlatform {
dispatcher: Arc<Dispatcher>,
fonts: Arc<FontSystem>,
fonts: Arc<TextSystem>,
pasteboard: id,
text_hash_pasteboard_type: id,
metadata_pasteboard_type: id,
@ -498,7 +498,7 @@ impl MacPlatform {
pub fn new() -> Self {
Self {
dispatcher: Arc::new(Dispatcher),
fonts: Arc::new(FontSystem::new()),
fonts: Arc::new(TextSystem::new()),
pasteboard: unsafe { NSPasteboard::generalPasteboard(nil) },
text_hash_pasteboard_type: unsafe { ns_string("zed-text-hash") },
metadata_pasteboard_type: unsafe { ns_string("zed-metadata") },