hasufell/neovim-gtk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use font options from gtk widget (#88)

Browse Source
This commit is contained in:
daa 2018-04-29 22:43:35 +03:00
parent 058f9a70bf
commit bda35efe88
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/render/context.rs
View File

@ -1,4 +1,3 @@
use pangocairo::FontMap;
use pango::prelude::*; use pango::prelude::*;
use pango; use pango;
@ -13,14 +12,14 @@ pub struct Context {
} }
impl Context { impl Context {
pub fn new(font_desc: pango::FontDescription) -> Self { pub fn new(pango_context: pango::Context) -> Self {
Context { Context {
state: ContextState::new(font_desc), state: ContextState::new(pango_context),
} }
} }
pub fn update(&mut self, font_desc: pango::FontDescription) { pub fn update(&mut self, pango_context: pango::Context) {
self.state = ContextState::new(font_desc); self.state = ContextState::new(pango_context);
} }
pub fn itemize(&self, line: &StyledLine) -> Vec<sys_pango::Item> { pub fn itemize(&self, line: &StyledLine) -> Vec<sys_pango::Item> {
@ -62,12 +61,9 @@ struct ContextState {
} }
impl ContextState { impl ContextState {
pub fn new(font_desc: pango::FontDescription) -> Self { pub fn new(pango_context: pango::Context) -> Self {
let font_map = FontMap::get_default().unwrap();
let pango_context = font_map.create_context().unwrap();
pango_context.set_font_description(&font_desc);
let font_metrics = pango_context.get_metrics(None, None).unwrap(); let font_metrics = pango_context.get_metrics(None, None).unwrap();
let font_desc = pango_context.get_font_description().unwrap();
ContextState { ContextState {
pango_context, pango_context,

21
src/shell.rs
View File

@ -7,6 +7,8 @@ use std::thread;
use std::collections::HashMap; use std::collections::HashMap;
use std::time::Duration; use std::time::Duration;
use pango;
use pango::prelude::*;
use cairo; use cairo;
use cairo::prelude::*; use cairo::prelude::*;
use pango::{FontDescription, LayoutExt}; use pango::{FontDescription, LayoutExt};
@ -91,9 +93,9 @@ pub struct RenderState {
} }
impl RenderState { impl RenderState {
pub fn new() -> Self { pub fn new(pango_context: pango::Context) -> Self {
RenderState { RenderState {
font_ctx: render::Context::new(FontDescription::from_string(DEFAULT_FONT_NAME)), font_ctx: render::Context::new(pango_context),
color_model: ColorModel::new(), color_model: ColorModel::new(),
mode: mode::Mode::new(), mode: mode::Mode::new(),
} }
@ -139,7 +141,11 @@ pub struct State {
impl State { impl State {
pub fn new(settings: Rc<RefCell<Settings>>, options: ShellOptions) -> State { pub fn new(settings: Rc<RefCell<Settings>>, options: ShellOptions) -> State {
let drawing_area = gtk::DrawingArea::new(); let drawing_area = gtk::DrawingArea::new();
let render_state = Rc::new(RefCell::new(RenderState::new()));
let pango_context = drawing_area.create_pango_context().unwrap();
pango_context.set_font_description(&FontDescription::from_string(DEFAULT_FONT_NAME));
let render_state = Rc::new(RefCell::new(RenderState::new(pango_context)));
let popup_menu = PopupMenu::new(&drawing_area); let popup_menu = PopupMenu::new(&drawing_area);
let cmd_line = CmdLine::new(&drawing_area, render_state.clone()); let cmd_line = CmdLine::new(&drawing_area, render_state.clone());
@ -258,10 +264,13 @@ impl State {
} }
pub fn set_font_desc(&mut self, desc: &str) { pub fn set_font_desc(&mut self, desc: &str) {
let pango_context = self.drawing_area.create_pango_context().unwrap();
pango_context.set_font_description(&FontDescription::from_string(desc));
self.render_state self.render_state
.borrow_mut() .borrow_mut()
.font_ctx .font_ctx
.update(FontDescription::from_string(desc)); .update(pango_context);
self.model.clear_glyphs(); self.model.clear_glyphs();
self.try_nvim_resize(); self.try_nvim_resize();
self.on_redraw(&RepaintMode::All); self.on_redraw(&RepaintMode::All);
@ -1181,9 +1190,7 @@ impl State {
pub fn on_put(&mut self, text: String) -> RepaintMode { pub fn on_put(&mut self, text: String) -> RepaintMode {
let double_width = text.is_empty(); let double_width = text.is_empty();
RepaintMode::Area( RepaintMode::Area(self.model.put(&text, double_width, self.cur_attrs.as_ref()))
self.model.put(&text, double_width, self.cur_attrs.as_ref()),
)
} }
pub fn on_clear(&mut self) -> RepaintMode { pub fn on_clear(&mut self) -> RepaintMode {