fix alignment issues

x86y · Mar 18, 2024 · 86ce185 · 86ce185
1 parent ce89c90
commit 86ce185
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -42,7 +42,6 @@ jobs:
           mv target/x86_64-pc-windows-gnu/release/dynasty.exe ./dynasty_x86_64-pc-windows-gnu.exe
       - name: Release
         uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
             dynasty_x86_64-unknown-linux-gnu
@@ -79,7 +78,6 @@ jobs:
           ./create-dmg/create-dmg Dynasty_x86_64-apple-darwin.dmg target/release/bundle/osx/Dynasty.app
       - name: Release
         uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
             Dynasty_aarch64-apple-darwin.dmg

diff --git a/src/views/panes/book.rs b/src/views/panes/book.rs
@@ -72,10 +72,14 @@ pub fn book_view(
                 .next_back()
                 .unwrap_or((&String::new(), &0.0))
                 .0
-        )),
+        ))
+        .font(iced::Font {
+            weight: iced::font::Weight::Bold,
+            ..Default::default()
+        }),
         bid_rows,
     ]
-    .padding(12)
+    .padding([2, 12])
     .spacing(10)
     .max_width(500);
 

diff --git a/src/views/panes/trades.rs b/src/views/panes/trades.rs
@@ -2,7 +2,7 @@ use std::collections::VecDeque;
 
 use binance::ws_model::TradesEvent;
 use iced::{
-    widget::{column, container, row, scrollable, Column, Space},
+    widget::{column, container, row, scrollable, Column},
     Color, Element, Length,
 };
 
@@ -13,11 +13,9 @@ use super::orders::{t, tb};
 pub fn trades_view(bs: &VecDeque<TradesEvent>) -> Element<'_, Message> {
     column![
         row![
-            tb("Price"),
-            Space::new(Length::Fill, 1.0),
-            tb("Amount"),
-            Space::new(Length::Fill, 1.0),
-            tb("Time")
+            tb("Price").width(Length::Fill),
+            tb("Amount").width(Length::Fill),
+            tb("Time").width(Length::Fill)
         ],
         scrollable(Column::with_children(
             bs.iter()
@@ -28,18 +26,21 @@ pub fn trades_view(bs: &VecDeque<TradesEvent>) -> Element<'_, Message> {
                         Color::from_rgb(0.0, 1.0, 0.0)
                     };
                     container(row![
-                        t(format!("{:.2}", b.price.parse::<f32>().unwrap())).style(c),
-                        Space::new(Length::Fill, 1.0),
+                        t(format!("{:.2}", b.price.parse::<f32>().unwrap()))
+                            .style(c)
+                            .width(Length::Fill),
                         t(format!("{:.2} ", b.qty.parse::<f32>().unwrap()))
+                            .width(Length::Fill)
                             .style(h2c("B7BDB7").unwrap()),
-                        Space::new(Length::Fill, 1.0),
-                        t(b.trade_order_time).style(h2c("B7BDB7").unwrap()),
+                        t(b.trade_order_time)
+                            .style(h2c("B7BDB7").unwrap())
+                            .width(Length::Fill),
                     ])
                     .width(Length::Fill)
                 })
                 .map(Element::from),
         )) //    .style(ScrollbarStyle::theme())
     ]
-    .padding([2, 12])
+    .padding([2, 4])
     .into()
 }