Finish tabline implementation
This commit is contained in:
@@ -885,7 +885,7 @@ impl RedrawEvents for State {
|
||||
|
||||
|
||||
fn tabline_update(&mut self, selected: Tabpage, tabs: Vec<(Tabpage, Option<&str>)>) -> RepaintMode {
|
||||
self.tabs.update_tabs(&selected, &tabs);
|
||||
self.tabs.update_tabs(&self.nvim.as_ref().unwrap(), &selected, &tabs);
|
||||
|
||||
RepaintMode::Nothing
|
||||
}
|
||||
|
||||
@@ -1,12 +1,38 @@
|
||||
use std::ops::Deref;
|
||||
use std::rc::Rc;
|
||||
use std::cell::RefCell;
|
||||
|
||||
use gtk;
|
||||
use gtk::prelude::*;
|
||||
|
||||
use neovim_lib::{Neovim, NeovimApi};
|
||||
use neovim_lib::neovim_api::Tabpage;
|
||||
|
||||
use nvim::ErrorReport;
|
||||
|
||||
struct State {
|
||||
data: Vec<Tabpage>,
|
||||
nvim: Option<Rc<RefCell<Neovim>>>,
|
||||
}
|
||||
|
||||
impl State {
|
||||
pub fn new() -> Self {
|
||||
State {
|
||||
data: Vec::new(),
|
||||
nvim: None,
|
||||
}
|
||||
}
|
||||
|
||||
fn change_current_page(&self, idx: i32) -> bool {
|
||||
let mut nvim = self.nvim.as_ref().unwrap().borrow_mut();
|
||||
nvim.set_current_tabpage(&self.data[idx as usize]).report_err(&mut *nvim);
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Tabline {
|
||||
tabs: gtk::Notebook,
|
||||
state: Rc<RefCell<State>>,
|
||||
}
|
||||
|
||||
impl Tabline {
|
||||
@@ -17,13 +43,33 @@ impl Tabline {
|
||||
tabs.set_scrollable(true);
|
||||
tabs.set_show_border(false);
|
||||
tabs.set_border_width(0);
|
||||
tabs.hide();
|
||||
|
||||
let state = Rc::new(RefCell::new(State::new()));
|
||||
|
||||
let state_ref = state.clone();
|
||||
tabs.connect_change_current_page(move |_, idx| state_ref.borrow().change_current_page(idx));
|
||||
|
||||
Tabline {
|
||||
tabs,
|
||||
state,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn update_tabs(&self, selected: &Tabpage, tabs: &Vec<(Tabpage, Option<&str>)>) {
|
||||
pub fn update_tabs(&self, nvim: &Rc<RefCell<Neovim>>, selected: &Tabpage, tabs: &Vec<(Tabpage, Option<&str>)>) {
|
||||
if tabs.len() <= 1 {
|
||||
self.tabs.hide();
|
||||
return;
|
||||
} else {
|
||||
self.tabs.show();
|
||||
}
|
||||
|
||||
let mut state = self.state.borrow_mut();
|
||||
|
||||
if state.nvim.is_none() {
|
||||
state.nvim = Some(nvim.clone());
|
||||
}
|
||||
|
||||
let count = self.tabs.get_n_pages() as usize;
|
||||
if count < tabs.len() {
|
||||
for _ in count..tabs.len() {
|
||||
@@ -38,10 +84,16 @@ impl Tabline {
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: current page
|
||||
state.data.clear();
|
||||
|
||||
for (idx, tab) in tabs.iter().enumerate() {
|
||||
let tab_child = self.tabs.get_nth_page(Some(idx as u32));
|
||||
self.tabs.set_tab_label_text(&tab_child.unwrap(), &tab.1.unwrap_or("??"));
|
||||
state.data.push(tab.0.clone());
|
||||
|
||||
if *selected == tab.0 {
|
||||
self.tabs.set_current_page(Some(idx as u32));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user