diff options
author | Christian Duerr <contact@christianduerr.com> | 2020-07-18 01:27:41 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-18 01:27:41 +0000 |
commit | 7a4b4a6a24e3894051fd31da63ee6baca16c70ce (patch) | |
tree | da14ed43cb1b28d5e44f22717e531e5b2128bbf9 /alacritty/src/display.rs | |
parent | 411318e6a5aaa72a9e35f489121546d84da093a2 (diff) | |
download | r-alacritty-7a4b4a6a24e3894051fd31da63ee6baca16c70ce.tar.gz r-alacritty-7a4b4a6a24e3894051fd31da63ee6baca16c70ce.tar.bz2 r-alacritty-7a4b4a6a24e3894051fd31da63ee6baca16c70ce.zip |
Rename font crate to crossfont
Diffstat (limited to 'alacritty/src/display.rs')
-rw-r--r-- | alacritty/src/display.rs | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/alacritty/src/display.rs b/alacritty/src/display.rs index abbb3666..ad22c852 100644 --- a/alacritty/src/display.rs +++ b/alacritty/src/display.rs @@ -21,12 +21,12 @@ use unicode_width::UnicodeWidthChar; use wayland_client::{Display as WaylandDisplay, EventQueue}; #[cfg(target_os = "macos")] -use font::set_font_smoothing; -use font::{self, Rasterize, Rasterizer}; +use crossfont::set_font_smoothing; +use crossfont::{self, Rasterize, Rasterizer}; use alacritty_terminal::event::{EventListener, OnResize}; -use alacritty_terminal::index::{Line, Direction}; use alacritty_terminal::index::{Column, Point}; +use alacritty_terminal::index::{Direction, Line}; use alacritty_terminal::selection::Selection; use alacritty_terminal::term::{RenderableCell, SizeInfo, Term, TermMode}; @@ -50,7 +50,7 @@ pub enum Error { Window(window::Error), /// Error dealing with fonts. - Font(font::Error), + Font(crossfont::Error), /// Error in renderer. Render(renderer::Error), @@ -87,8 +87,8 @@ impl From<window::Error> for Error { } } -impl From<font::Error> for Error { - fn from(val: font::Error) -> Self { +impl From<crossfont::Error> for Error { + fn from(val: crossfont::Error) -> Self { Error::Font(val) } } @@ -621,11 +621,7 @@ impl Display { } /// Format search regex to account for the cursor and fullwidth characters. - fn format_search( - size_info: &SizeInfo, - search_regex: &str, - search_label: &str, - ) -> String { + fn format_search(size_info: &SizeInfo, search_regex: &str, search_label: &str) -> String { // Add spacers for wide chars. let mut formatted_regex = String::with_capacity(search_regex.len()); for c in search_regex.chars() { @@ -721,7 +717,7 @@ fn dynamic_padding(padding: f32, dimension: f32, cell_dimension: f32) -> f32 { /// Calculate the cell dimensions based on font metrics. #[inline] -fn compute_cell_size(config: &Config, metrics: &font::Metrics) -> (f32, f32) { +fn compute_cell_size(config: &Config, metrics: &crossfont::Metrics) -> (f32, f32) { let offset_x = f64::from(config.ui_config.font.offset.x); let offset_y = f64::from(config.ui_config.font.offset.y); ( |