PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-18 13:55:23 -05:00
Code Releases Activity

Deprecate config top-level dimensions and padding

Browse source
This commit is contained in:
Joe Wilm 2017-12-22 12:47:14 -08:00
parent 86ff6e19c4
commit 21c003c3be
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/config.rs
View file

@ -211,7 +211,6 @@ impl Default for Alpha {
#[derive(Debug, Copy, Clone, Deserialize)] #[derive(Debug, Copy, Clone, Deserialize)]
pub struct WindowConfig { pub struct WindowConfig {
/// Initial dimensions /// Initial dimensions
#[serde(default)] #[serde(default)]
dimensions: Dimensions, dimensions: Dimensions,
@ -244,6 +243,14 @@ impl Default for WindowConfig {
/// Top-level config type /// Top-level config type
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
pub struct Config { pub struct Config {
/// Initial dimensions
#[serde(default)]
dimensions: Option<Dimensions>,
/// Pixel padding
#[serde(default)]
padding: Option<Delta>,
/// TERM env variable /// TERM env variable
#[serde(default)] #[serde(default)]
env: HashMap<String, String>, env: HashMap<String, String>,
@ -347,6 +354,8 @@ impl Default for Config {
fn default() -> Config { fn default() -> Config {
Config { Config {
draw_bold_text_with_bright_colors: true, draw_bold_text_with_bright_colors: true,
dimensions: None,
padding: None,
font: Default::default(), font: Default::default(),
render_timer: Default::default(), render_timer: Default::default(),
custom_cursor_colors: false, custom_cursor_colors: false,
@ -1149,7 +1158,8 @@ impl Config {
} }
pub fn padding(&self) -> &Delta { pub fn padding(&self) -> &Delta {
&self.window.padding self.padding.as_ref()
.unwrap_or(&self.window.padding)
} }
#[inline] #[inline]
@ -1166,7 +1176,7 @@ impl Config {
/// Get window dimensions /// Get window dimensions
#[inline] #[inline]
pub fn dimensions(&self) -> Dimensions { pub fn dimensions(&self) -> Dimensions {
self.window.dimensions self.dimensions.unwrap_or(self.window.dimensions)
} }
/// Get window config /// Get window config
@ -1235,6 +1245,7 @@ impl Config {
let raw = Config::read_file(path.as_path())?; let raw = Config::read_file(path.as_path())?;
let mut config: Config = serde_yaml::from_str(&raw)?; let mut config: Config = serde_yaml::from_str(&raw)?;
config.config_path = Some(path); config.config_path = Some(path);
config.print_deprecation_warnings();
Ok(config) Ok(config)
} }
@ -1249,6 +1260,19 @@ impl Config {
Ok(contents) Ok(contents)
} }
fn print_deprecation_warnings(&self) {
use ::util::fmt;
if self.dimensions.is_some() {
eprintln!("{}", fmt::Yellow("Config `dimensions` is deprecated. \
Please use `window.dimensions` instead."));
}
if self.padding.is_some() {
eprintln!("{}", fmt::Yellow("Config `padding` is deprecated. \
Please use `window.padding` instead."));
}
}
} }
/// Window Dimensions /// Window Dimensions