From 3d1c524e0b0a5b3bb12e4e7226084639a82d1feb Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Sun, 22 Jan 2023 00:55:30 +0100 Subject: [PATCH] fix initial --- rio/src/main.rs | 7 ++++--- rio/src/shared/mod.rs | 3 --- rio/src/window/mod.rs | 12 +++++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rio/src/main.rs b/rio/src/main.rs index 2f1a2bc0c1..c47ce9e0a5 100644 --- a/rio/src/main.rs +++ b/rio/src/main.rs @@ -18,11 +18,12 @@ use winit::{event, event_loop}; async fn main() -> Result<(), Box> { let event_loop = event_loop::EventLoop::new(); - let window_builder = window::create_window_builder("Rio"); - let winit_window = window_builder.build(&event_loop).unwrap(); - let config = Config::load_macos(); + let window_builder = + window::create_window_builder("Rio", (config.width, config.height)); + let winit_window = window_builder.build(&event_loop).unwrap(); + std::env::set_var("TERM", "xterm-256color"); let shell: String = match std::env::var("SHELL") { Ok(val) => val, diff --git a/rio/src/shared/mod.rs b/rio/src/shared/mod.rs index 98c245b089..5e54581529 100644 --- a/rio/src/shared/mod.rs +++ b/rio/src/shared/mod.rs @@ -7,9 +7,6 @@ pub const FONT_FIRA_MONO: &[u8; 170204] = include_bytes!("./fonts/Fira_Mono/FiraMono-Regular.ttf"); // Terminal W/H contraints -pub const DEFAULT_WINDOW_HEIGHT: i32 = 400; -pub const DEFAULT_WINDOW_WIDTH: i32 = 600; - pub const DEFAULT_MINIMUM_WINDOW_HEIGHT: i32 = 400; pub const DEFAULT_MINIMUM_WINDOW_WIDTH: i32 = 400; diff --git a/rio/src/window/mod.rs b/rio/src/window/mod.rs index cb9cb8a8a2..ed38888667 100644 --- a/rio/src/window/mod.rs +++ b/rio/src/window/mod.rs @@ -3,11 +3,13 @@ pub mod input; mod keys; use crate::shared::{ - DEFAULT_MINIMUM_WINDOW_HEIGHT, DEFAULT_MINIMUM_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT, - DEFAULT_WINDOW_WIDTH, LOGO_ICON, + DEFAULT_MINIMUM_WINDOW_HEIGHT, DEFAULT_MINIMUM_WINDOW_WIDTH, LOGO_ICON, }; -pub fn create_window_builder(title: &str) -> winit::window::WindowBuilder { +pub fn create_window_builder( + title: &str, + size: (u16, u16), +) -> winit::window::WindowBuilder { use winit::window::Icon; let image_icon = image::load_from_memory(LOGO_ICON).unwrap(); @@ -21,8 +23,8 @@ pub fn create_window_builder(title: &str) -> winit::window::WindowBuilder { let mut window_builder = winit::window::WindowBuilder::new() .with_title(title) .with_inner_size(winit::dpi::LogicalSize { - width: DEFAULT_WINDOW_WIDTH, - height: DEFAULT_WINDOW_HEIGHT, + width: size.0, + height: size.1, }) .with_min_inner_size(winit::dpi::LogicalSize { width: DEFAULT_MINIMUM_WINDOW_WIDTH,