fix initial

raphamorim · Jan 21, 2023 · 3d1c524 · 3d1c524
1 parent 0183a4c
commit 3d1c524
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/rio/src/main.rs b/rio/src/main.rs
@@ -18,11 +18,12 @@ use winit::{event, event_loop};
 async fn main() -> Result<(), Box<dyn Error>> {
     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
@@ -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
@@ -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,