aboutsummaryrefslogtreecommitdiff
path: root/src/renderer/mod.rs
diff options
context:
space:
mode:
authorJoe Wilm <jwilm@users.noreply.github.com>2018-09-17 08:15:20 -0700
committerGitHub <noreply@github.com>2018-09-17 08:15:20 -0700
commitcff58e9d683c44a34f37e628c7faaea4410ada74 (patch)
treee051a942190247faeab42757dd6a5f08db5a7cca /src/renderer/mod.rs
parent865727c062810e29fa33b5c04bb05510e7da3ddf (diff)
parent054e38e98d8f150b99b50fec9f679c3d23875a0a (diff)
downloadr-alacritty-cff58e9d683c44a34f37e628c7faaea4410ada74.tar.gz
r-alacritty-cff58e9d683c44a34f37e628c7faaea4410ada74.tar.bz2
r-alacritty-cff58e9d683c44a34f37e628c7faaea4410ada74.zip
Merge pull request #1147 from jwilm/scrollback
Scrollback
Diffstat (limited to 'src/renderer/mod.rs')
-rw-r--r--src/renderer/mod.rs16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
index 560685af..68335e1c 100644
--- a/src/renderer/mod.rs
+++ b/src/renderer/mod.rs
@@ -1355,11 +1355,11 @@ impl Atlas {
}
/// Insert a RasterizedGlyph into the texture atlas
- pub fn insert(&mut self,
- glyph: &RasterizedGlyph,
- active_tex: &mut u32)
- -> Result<Glyph, AtlasInsertError>
- {
+ pub fn insert(
+ &mut self,
+ glyph: &RasterizedGlyph,
+ active_tex: &mut u32
+ ) -> Result<Glyph, AtlasInsertError> {
if glyph.width > self.width || glyph.height > self.height {
return Err(AtlasInsertError::GlyphTooLarge);
}
@@ -1383,11 +1383,7 @@ impl Atlas {
/// Internal function for use once atlas has been checked for space. GL
/// errors could still occur at this point if we were checking for them;
/// hence, the Result.
- fn insert_inner(&mut self,
- glyph: &RasterizedGlyph,
- active_tex: &mut u32)
- -> Glyph
- {
+ fn insert_inner(&mut self, glyph: &RasterizedGlyph, active_tex: &mut u32) -> Glyph {
let offset_y = self.row_baseline;
let offset_x = self.row_extent;
let height = glyph.height as i32;