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

Fix popup width in case kind column is visible (#34)

Browse Source
This commit is contained in:
daa 2018-01-08 23:33:35 +03:00
parent 4bf2cca12c
commit a6e16d1cbd
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/popup_menu.rs
View File

@ -87,41 +87,37 @@ impl State {
} }
fn limit_column_widths(&self, menu: &[CompleteItem], shell: &shell::State) { fn limit_column_widths(&self, menu: &[CompleteItem], shell: &shell::State) {
const DEFAULT_PADDING: i32 = 5;
let layout = shell.font_ctx.create_layout(); let layout = shell.font_ctx.create_layout();
let kind_chars = menu.iter().map(|i| i.kind.len()).max().unwrap(); let kind_exists = menu.iter().find(|i| i.kind.len() > 0).is_some();
let max_width = self.scroll.get_max_content_width(); let max_width = self.scroll.get_max_content_width();
let (xpad, _) = self.renderer.get_padding(); let (xpad, _) = self.renderer.get_padding();
const DEFAULT_PADDING: i32 = 5; let max_word_line = menu.iter().max_by_key(|m| m.word.len()).unwrap();
layout.set_text(max_word_line.word);
let (word_max_width, _) = layout.get_pixel_size();
let word_column_width = word_max_width + xpad * 2 + DEFAULT_PADDING;
if kind_chars > 0 {
if kind_exists {
layout.set_text("[v]"); layout.set_text("[v]");
let (kind_width, _) = layout.get_pixel_size(); let (kind_width, _) = layout.get_pixel_size();
self.word_column.set_fixed_width(max_width - kind_width);
self.kind_column.set_fixed_width(kind_width + xpad * 2 + DEFAULT_PADDING); self.kind_column.set_fixed_width(kind_width + xpad * 2 + DEFAULT_PADDING);
self.kind_column.set_visible(true); self.kind_column.set_visible(true);
self.word_column.set_fixed_width(min(max_width - kind_width, word_column_width));
} else { } else {
let max_line = menu.iter().max_by_key(|m| m.word.len()).unwrap();
layout.set_text(max_line.word);
let (word_max_width, _) = layout.get_pixel_size();
self.kind_column.set_visible(false); self.kind_column.set_visible(false);
self.word_column.set_fixed_width(min(max_width, word_column_width));
let word_column_width = word_max_width + xpad * 2 + DEFAULT_PADDING;
if word_column_width > max_width {
self.word_column.set_fixed_width(max_width);
} else {
self.word_column.set_fixed_width(word_column_width);
}
} }
let max_line = menu.iter().max_by_key(|m| m.menu.len()).unwrap(); let max_menu_line = menu.iter().max_by_key(|m| m.menu.len()).unwrap();
if max_line.menu.len() > 0 { if max_menu_line.menu.len() > 0 {
layout.set_text(max_line.menu); layout.set_text(max_menu_line.menu);
let (menu_max_width, _) = layout.get_pixel_size(); let (menu_max_width, _) = layout.get_pixel_size();
self.menu_column.set_fixed_width(menu_max_width + xpad * 2 + DEFAULT_PADDING); self.menu_column.set_fixed_width(menu_max_width + xpad * 2 + DEFAULT_PADDING);
self.menu_column.set_visible(true); self.menu_column.set_visible(true);