wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-23 05:12:40 +03:00
Code Issues Projects Releases Wiki Activity

cargo update

Browse Source 
We need a newer version of ring in order to compile on M1

refs: #343
This commit is contained in:
Wez Furlong 2020-12-05 10:30:13 -08:00
parent bbb953610d
commit e86d949dae
5 changed files with 588 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

980
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

1
codec/src/lib.rs
View File

@ -21,6 +21,7 @@ use mux::window::WindowId;
use portable_pty::{CommandBuilder, PtySize};
use rangeset::*;
use serde::{Deserialize, Serialize};
use smol::io::AsyncWriteExt;
use smol::prelude::*;
use std::convert::TryInto;
use std::io::Cursor;

2
config/src/font.rs
View File

@ -168,8 +168,6 @@ impl TextStyle {
font.push(FontAttributes::new_fallback("Apple Symbols"));
#[cfg(target_os = "macos")]
font.push(FontAttributes::new_fallback("Zapf Dingbats"));
#[cfg(target_os = "macos")]
font.push(FontAttributes::new_fallback("Apple LiGothic"));
// Fallback font that has unicode replacement character
#[cfg(windows)]

2
wezterm-gui/src/gui/glyphcache.rs
View File

@ -296,7 +296,7 @@ impl<T: Texture2d> GlyphCache<T> {
return Ok(sprite.clone());
}
let decoded_image = image::load_from_memory(image_data.data())?.to_bgra();
let decoded_image = image::load_from_memory(image_data.data())?.to_bgra8();
let (width, height) = decoded_image.dimensions();
let image = ::window::bitmaps::Image::from_raw(
width as usize,

2
wezterm-gui/src/gui/termwindow.rs
View File

@ -968,7 +968,7 @@ impl TermWindow {
fn apply_icon(window: &Window) -> anyhow::Result<()> {
let icon_image =
image::load_from_memory(include_bytes!("../../../assets/icon/terminal.png"))?;
let image = icon_image.to_bgra();
let image = icon_image.to_bgra8();
let (width, height) = image.dimensions();
window.set_icon(Image::from_raw(
width as usize,