prepare release for 0.0.7

Author: raphamorim

CHANGELOG.md

@@ -19,6 +19,7 @@ theme = "lucario"
 font-size = 18
 ```
 
+- Fix Background color not entirely set on vim [#88](https://github.com/raphamorim/rio/issues/88)
 - Scroll now works for x11 and wayland.
 - No longer renders to macos and x11 windows that are fully occluded / not directly visible.
 - Introduced `window-opacity` config property for WebAssembly and Wayland builds.

Cargo.lock

@@ -17,9 +17,10 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleIconFile</key>
-  <string>Rio-canary.icns</string>
+  <!-- <string>Rio-canary.icns</string> -->
+  <string>Rio-stable.icns</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.0.7-canary</string>
+  <string>0.0.7</string>
   <key>CFBundleVersion</key>
   <string>20230528.115631</string>
   <key>CSResourcesFileMapped</key>

misc/osx/Rio.app/Contents/Info.plist

@@ -1,6 +1,6 @@
 [package]
 name = "rio"
-version = "0.0.7-canary"
+version = "0.0.7"
 authors = ["Raphael Amorim <[email protected]>"]
 edition = "2021"
 license = "MIT"

rio/Cargo.toml

@@ -206,7 +206,7 @@ impl State {
         let mut decoration = None;
         if flags.contains(Flags::UNDERLINE) {
             decoration = Some(SugarDecoration {
-                position: (0.0, 0.95),
+                position: (0.0, 0.92),
                 size: (1.0, 0.025),
                 color: self.named_colors.foreground,
             });
@@ -236,7 +236,7 @@ impl State {
                 color: self.named_colors.cursor,
             }),
             CursorShape::Underline => Some(SugarDecoration {
-                position: (0.0, 0.95),
+                position: (0.0, 0.92),
                 size: (1.0, 0.05),
                 color: self.named_colors.cursor,
             }),
@@ -249,6 +249,21 @@ impl State {
         }
     }
 
+    #[inline]
+    fn create_empty_sugar_stack_from_columns(&self, columns: usize) -> SugarStack {
+        let mut stack: Vec<Sugar> = vec![];
+        for _ in 0..columns {
+            stack.push(Sugar {
+                content: ' ',
+                foreground_color: self.named_colors.background.0,
+                background_color: self.named_colors.background.0,
+                style: None,
+                decoration: None,
+            })
+        }
+        stack
+    }
+
     #[inline]
     fn create_sugar_stack_with_selection(
         &mut self,
@@ -356,6 +371,7 @@ impl State {
     ) {
         self.cursor.state = cursor;
         let is_cursor_visible = self.cursor.state.is_visible();
+
         if let Some(sel) = self.selection_range {
             for (i, row) in rows.iter().enumerate() {
                 let has_cursor = is_cursor_visible && self.cursor.state.pos.row == i;
@@ -367,15 +383,18 @@ impl State {
                 );
                 sugarloaf.stack(sugar_stack);
             }
-
-            return;
+        } else {
+            for (i, row) in rows.iter().enumerate() {
+                let has_cursor = is_cursor_visible && self.cursor.state.pos.row == i;
+                let sugar_stack = self.create_sugar_stack(row, has_cursor);
+                sugarloaf.stack(sugar_stack);
+            }
         }
 
-        for (i, row) in rows.iter().enumerate() {
-            let has_cursor = is_cursor_visible && self.cursor.state.pos.row == i;
-            let sugar_stack = self.create_sugar_stack(row, has_cursor);
-            sugarloaf.stack(sugar_stack);
-        }
+        // This is a fake row created only for visual purposes
+        let empty_last_line =
+            self.create_empty_sugar_stack_from_columns(sugarloaf.layout.columns);
+        sugarloaf.stack(empty_last_line);
 
         if context_manager.len() > 1 {
             let mut renderable_tabs = vec![];

rio/src/screen/state.rs

@@ -136,17 +136,19 @@ impl SugarloafLayout {
 
         // SugarStack is a primitive representation of columns data
         let current_stack_bound = self.font_bound * self.columns as f32;
-        let expected_stack_bound = self.width / self.scale_factor  - self.font_bound;
+        let expected_stack_bound = self.width / self.scale_factor - self.font_bound;
 
         log::info!("expected {}", self.columns);
         if current_stack_bound < expected_stack_bound {
-            let stack_difference = ((expected_stack_bound - current_stack_bound) / self.font_bound) as usize;
+            let stack_difference =
+                ((expected_stack_bound - current_stack_bound) / self.font_bound) as usize;
             log::info!("recalculating columns due to font width, adding more {stack_difference:?} columns");
             self.columns += stack_difference;
         }
 
         if current_stack_bound > expected_stack_bound {
-            let stack_difference = ((current_stack_bound - expected_stack_bound) / self.font_bound) as usize;
+            let stack_difference =
+                ((current_stack_bound - expected_stack_bound) / self.font_bound) as usize;
             log::info!("recalculating columns due to font width, removing {stack_difference:?} columns");
             self.columns -= stack_difference;
         }

sugarloaf/src/layout/mod.rs

@@ -259,7 +259,10 @@ impl Sugarloaf {
                     self.acc_line_y,
                 ],
                 color: sugar.background_color,
-                size: [add_pos_x * mod_size, ((self.font_bounds.default.0 * mod_size).ceil() + mod_size)],
+                size: [
+                    add_pos_x * mod_size,
+                    ((self.font_bounds.default.0 * mod_size).ceil() + mod_size),
+                ],
             });
 
             if let Some(decoration) = &sugar.decoration {
@@ -275,7 +278,7 @@ impl Sugarloaf {
                     color: decoration.color,
                     size: [
                         (dx * decoration.size.0) * mod_size,
-                        ((dy * decoration.size.1) * mod_size).ceil() + mod_size,
+                        ((dy * decoration.size.1) * mod_size).ceil(),
                     ],
                 });
             }
@@ -340,7 +343,6 @@ impl Sugarloaf {
         (0., 0.)
     }
 
-
     pub fn set_background_color(&mut self, color: wgpu::Color) -> &mut Self {
         self.layout.background_color = color;
         self
@@ -355,6 +357,7 @@ impl Sugarloaf {
     ///
     #[inline]
     pub fn calculate_bounds(&mut self) {
+        // TODO: Write tests for calculate_bounds
         self.reset_state();
         self.rects = vec![];
 
@@ -384,7 +387,8 @@ impl Sugarloaf {
                 // Bounds are defined in runtime
                 self.font_bounds.default = self.get_font_bounds(' ', FontId(0));
 
-                self.layout.update_columns_lines_per_font_bound(self.font_bounds.default.0);
+                self.layout
+                    .update_columns_lines_per_font_bound(self.font_bounds.default.0);
 
                 self.font_bounds.symbols =
                     // U+2AF9 => \u{2AF9} => ⫹

sugarloaf/src/sugarloaf.rs

@@ -78,8 +78,8 @@ async fn run() {
                 background_color: [0.0, 0.0, 0.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-                    position: (0.0, 0.95),
-                    size: (1.0, 0.025),
+                    position: (0.0, 0.90),
+                    size: (1.0, 0.050),
                     color: [0.0, 0.0, 0.0, 1.0],
                 }),
             },
@@ -89,7 +89,7 @@ async fn run() {
                 background_color: [1.0, 1.0, 1.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-                    position: (0.0, 0.95),
+                    position: (0.0, 0.90),
                     size: (1.0, 0.025),
                     color: [0.0, 0.0, 0.0, 1.0],
                 }),
@@ -100,7 +100,7 @@ async fn run() {
                 background_color: [0.0, 0.0, 0.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-                    position: (0.0, 0.95),
+                    position: (0.0, 0.92),
                     size: (1.0, 0.025),
                     color: [0.0, 0.0, 0.0, 1.0],
                 }),
@@ -111,7 +111,7 @@ async fn run() {
                 background_color: [1.0, 1.0, 1.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-                    position: (0.0, 0.95),
+                    position: (0.0, 0.92),
                     size: (1.0, 0.025),
                     color: [0.0, 0.0, 0.0, 1.0],
                 }),
@@ -122,7 +122,7 @@ async fn run() {
                 background_color: [0.0, 0.0, 0.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-                    position: (0.0, 0.95),
+                    position: (0.0, 0.92),
                     size: (1.0, 0.025),
                     color: [0.0, 0.0, 0.0, 1.0],
                 }),
@@ -133,7 +133,7 @@ async fn run() {
                 background_color: [0.0, 0.0, 1.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-                    position: (0.0, 0.95),
+                    position: (0.0, 0.92),
                     size: (1.0, 0.025),
                     color: [0.0, 0.0, 0.0, 1.0],
                 }),
@@ -151,7 +151,7 @@ async fn run() {
                 background_color: [1.0, 1.0, 1.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-                    position: (0.0, 0.95),
+                    position: (0.0, 0.92),
                     size: (1.0, 0.025),
                     color: [0.0, 0.0, 0.0, 1.0],
                 }),
@@ -162,7 +162,7 @@ async fn run() {
                 background_color: [1.0, 1.0, 1.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-                    position: (0.0, 0.95),
+                    position: (0.0, 0.92),
                     size: (1.0, 0.025),
                     color: [0.0, 0.0, 0.0, 1.0],
                 }),
@@ -173,7 +173,7 @@ async fn run() {
                 background_color: [1.0, 1.0, 1.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-                    position: (0.0, 0.95),
+                    position: (0.0, 0.92),
                     size: (1.0, 0.025),
                     color: [0.0, 0.0, 0.0, 1.0],
                 }),
@@ -184,7 +184,7 @@ async fn run() {
                 background_color: [1.0, 1.0, 1.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-                    position: (0.0, 0.95),
+                    position: (0.0, 0.92),
                     size: (1.0, 0.025),
                     color: [0.0, 0.0, 0.0, 1.0],
                 }),
@@ -195,7 +195,7 @@ async fn run() {
                 background_color: [1.0, 1.0, 1.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-                    position: (0.0, 0.95),
+                    position: (0.0, 0.92),
                     size: (1.0, 0.025),
                     color: [0.0, 0.0, 0.0, 1.0],
                 }),
@@ -340,7 +340,7 @@ async fn run() {
                 background_color: [0.0, 0.0, 0.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-                    position: (0.0, 0.95),
+                    position: (0.0, 0.92),
                     size: (1.0, 0.05),
                     color: [0.0, 0.0, 0.0, 1.0],
                 }),
@@ -396,65 +396,65 @@ async fn run() {
                 background_color: [0.0, 0.0, 0.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-            position: (0.0, 0.5),
-            size: (1.0, 0.025),
-            color: [0.5, 0.5, 0.0, 1.0],
-        }),
+                    position: (0.0, 0.5),
+                    size: (1.0, 0.025),
+                    color: [0.5, 0.5, 0.0, 1.0],
+                }),
             },
             Sugar {
                 content: 't',
                 foreground_color: [1.0, 1.0, 1.0, 1.0],
                 background_color: [0.0, 0.0, 0.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-            position: (0.0, 0.5),
-            size: (1.0, 0.025),
-            color: [0.5, 0.5, 0.0, 1.0],
-        }),
+                    position: (0.0, 0.5),
+                    size: (1.0, 0.025),
+                    color: [0.5, 0.5, 0.0, 1.0],
+                }),
             },
             Sugar {
                 content: 'r',
                 foreground_color: [1.0, 1.0, 1.0, 1.0],
                 background_color: [0.0, 0.0, 0.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-            position: (0.0, 0.5),
-            size: (1.0, 0.025),
-            color: [0.5, 0.5, 0.0, 1.0],
-        }),
+                    position: (0.0, 0.5),
+                    size: (1.0, 0.025),
+                    color: [0.5, 0.5, 0.0, 1.0],
+                }),
             },
             Sugar {
                 content: 'i',
                 foreground_color: [1.0, 1.0, 1.0, 1.0],
                 background_color: [0.0, 0.0, 0.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-            position: (0.0, 0.5),
-            size: (1.0, 0.025),
-            color: [0.5, 0.5, 0.0, 1.0],
-        }),
+                    position: (0.0, 0.5),
+                    size: (1.0, 0.025),
+                    color: [0.5, 0.5, 0.0, 1.0],
+                }),
             },
             Sugar {
                 content: 'k',
                 foreground_color: [1.0, 1.0, 1.0, 1.0],
                 background_color: [0.0, 0.0, 0.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-            position: (0.0, 0.5),
-            size: (1.0, 0.025),
-            color: [0.5, 0.5, 0.0, 1.0],
-        }),
+                    position: (0.0, 0.5),
+                    size: (1.0, 0.025),
+                    color: [0.5, 0.5, 0.0, 1.0],
+                }),
             },
             Sugar {
                 content: 'e',
                 foreground_color: [1.0, 1.0, 1.0, 1.0],
                 background_color: [0.0, 0.0, 0.0, 1.0],
                 style: None,
                 decoration: Some(SugarDecoration {
-            position: (0.0, 0.5),
-            size: (1.0, 0.025),
-            color: [0.5, 0.5, 0.0, 1.0],
-        }),
+                    position: (0.0, 0.5),
+                    size: (1.0, 0.025),
+                    color: [0.5, 0.5, 0.0, 1.0],
+                }),
             },
         ];
 
@@ -465,7 +465,7 @@ async fn run() {
         });
 
         let underline = Some(SugarDecoration {
-            position: (0.0, 0.95),
+            position: (0.0, 0.92),
             size: (1.0, 0.05),
             color: [1.0, 0.4, 1.0, 1.0],
         });