aboutsummaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authordenis <denismaximov98@gmail.com>2021-03-27 15:30:53 +0200
committerdenis <denismaximov98@gmail.com>2021-03-27 15:30:53 +0200
commit6e276ae386f0f7e9dd3a4e1095d26e17f6c6401e (patch)
treee93c0e2c241e336baddbc2f124d8f09a54b3cd7f /src/client
parentwip: latest plugin system merge in (diff)
downloadsl0ppij-6e276ae386f0f7e9dd3a4e1095d26e17f6c6401e.tar.gz
sl0ppij-6e276ae386f0f7e9dd3a4e1095d26e17f6c6401e.tar.xz
sl0ppij-6e276ae386f0f7e9dd3a4e1095d26e17f6c6401e.zip
wip: move Palette out of zellij-tile
Diffstat (limited to 'src/client')
-rw-r--r--src/client/boundaries.rs3
-rw-r--r--src/client/tab.rs6
2 files changed, 6 insertions, 3 deletions
diff --git a/src/client/boundaries.rs b/src/client/boundaries.rs
index eb1a5a21..70671b6b 100644
--- a/src/client/boundaries.rs
+++ b/src/client/boundaries.rs
@@ -1,7 +1,8 @@
+use crate::common::{colors, Palette};
use crate::tab::Pane;
use ansi_term::Colour::RGB;
use std::collections::HashMap;
-use zellij_tile::data::{colors, InputMode, Palette};
+use zellij_tile::data::InputMode;
use std::fmt::{Display, Error, Formatter};
pub mod boundary_type {
diff --git a/src/client/tab.rs b/src/client/tab.rs
index d5a190f4..9203d75b 100644
--- a/src/client/tab.rs
+++ b/src/client/tab.rs
@@ -1,7 +1,9 @@
//! `Tab`s holds multiple panes. It tracks their coordinates (x/y) and size,
//! as well as how they should be resized
-use crate::common::{input::handler::parse_keys, AppInstruction, SenderWithContext};
+use crate::common::{
+ colors, input::handler::parse_keys, AppInstruction, Palette, SenderWithContext,
+};
use crate::layout::Layout;
use crate::panes::{PaneId, PositionAndSize, TerminalPane};
use crate::pty_bus::{PtyInstruction, VteEvent};
@@ -14,7 +16,7 @@ use std::{
collections::{BTreeMap, HashSet},
};
use std::{io::Write, sync::mpsc::channel};
-use zellij_tile::data::{colors, Event, InputMode, Palette};
+use zellij_tile::data::{Event, InputMode};
const CURSOR_HEIGHT_WIDTH_RATIO: usize = 4; // this is not accurate and kind of a magic number, TODO: look into this
const MIN_TERMINAL_HEIGHT: usize = 2;