mredaelli
/
meli
forked from meli/meli
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Pin first children in Tabbed

embed
Manos Pitsidianakis 2019-03-25 13:59:29 +02:00
parent a2e81ed354
commit e5856bd01e
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/src/components/utilities.rs
View File

@ -790,6 +790,7 @@ impl Component for Progress {
#[derive(Debug)] #[derive(Debug)]
pub struct Tabbed { pub struct Tabbed {
pinned: usize,
children: Vec<Entity>, children: Vec<Entity>,
cursor_pos: usize, cursor_pos: usize,
@ -800,7 +801,9 @@ pub struct Tabbed {
impl Tabbed { impl Tabbed {
pub fn new(children: Vec<Box<Component>>) -> Self { pub fn new(children: Vec<Box<Component>>) -> Self {
let pinned = children.len();
Tabbed { Tabbed {
pinned,
children: children.into_iter().map(Entity::from).collect(), children: children.into_iter().map(Entity::from).collect(),
cursor_pos: 0, cursor_pos: 0,
show_shortcuts: false, show_shortcuts: false,
@ -808,13 +811,16 @@ impl Tabbed {
} }
} }
fn draw_tabs(&mut self, grid: &mut CellBuffer, area: Area, context: &mut Context) { fn draw_tabs(&mut self, grid: &mut CellBuffer, area: Area, context: &mut Context) {
let upper_left = upper_left!(area);
let bottom_right = bottom_right!(area);
if self.children.is_empty() { if self.children.is_empty() {
clear_area(grid, area); clear_area(grid, area);
return; return;
} }
let mut x = get_x(upper_left!(area)); let mut x = get_x(upper_left);
let mut y: usize = get_y(upper_left!(area)); let y: usize = get_y(upper_left);
for (idx, c) in self.children.iter().enumerate() { for (idx, c) in self.children.iter().enumerate() {
let (fg, bg) = if idx == self.cursor_pos { let (fg, bg) = if idx == self.cursor_pos {
(Color::Default, Color::Default) (Color::Default, Color::Default)
@ -826,10 +832,13 @@ impl Tabbed {
grid, grid,
fg, fg,
bg, bg,
(set_x(upper_left!(area), x), bottom_right!(area)), (set_x(upper_left, x), bottom_right!(area)),
false, false,
); );
x = x_ + 1; x = x_ + 1;
if idx == self.pinned.saturating_sub(1) {
x += 2;
}
if y != _y_ { if y != _y_ {
break; break;
} }
@ -978,12 +987,18 @@ impl Component for Tabbed {
return true; return true;
} }
UIEventType::Action(Tab(Close)) => { UIEventType::Action(Tab(Close)) => {
if self.pinned > self.cursor_pos {
return true;
}
let id = *self.children[self.cursor_pos].id(); let id = *self.children[self.cursor_pos].id();
self.children[self.cursor_pos].kill(id); self.children[self.cursor_pos].kill(id);
self.set_dirty(); self.set_dirty();
return true; return true;
} }
UIEventType::Action(Tab(Kill(ref id))) => { UIEventType::Action(Tab(Kill(ref id))) => {
if self.pinned > self.cursor_pos {
return true;
}
if let Some(c_idx) = self.children.iter().position(|x| x.id() == id) { if let Some(c_idx) = self.children.iter().position(|x| x.id() == id) {
self.children.remove(c_idx); self.children.remove(c_idx);
self.cursor_pos = self.cursor_pos.saturating_sub(1); self.cursor_pos = self.cursor_pos.saturating_sub(1);