Merge pull request #184 from kevinaboos/fix_location_preview_label_la…

…yout Fix location preview label to be `width: Fill` such that wrapping works
project-robius · Oct 11, 2024 · 0fee755 · 0fee755
2 parents 5d8da58 + 44542db
commit 0fee755
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
@@ -697,6 +697,8 @@ live_design! {
         }
 
         <Label> {
+            width: Fill,
+            height: Fit,
             draw_text: {
                 wrap: Word,
                 color: (MESSAGE_TEXT_COLOR),
@@ -706,6 +708,8 @@ live_design! {
         }
 
         location_label = <Label> {
+            width: Fill,
+            height: Fit,
             align: {x: 0.0, y: 0.5},
             padding: {left: 5.0}
             draw_text: {
@@ -2978,10 +2982,11 @@ impl Widget for LocationPreview {
     fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
         let text = match self.coords {
             Some(Ok(c)) => {
-                // format!("Current location: {},{}\n   Timestamp: {:?}",
-                //     c.latitude, c.longitude, self.timestamp,
-                // )
-                format!("Current location: {},{}", c.latitude, c.longitude)
+                // if let Some(st) = self.timestamp {
+                //     format!("Current location: {:.6},{:.6}\n   Timestamp: {:?}", c.latitude, c.longitude, st)
+                // } else {
+                    format!("Current location: {:.6},{:.6}", c.latitude, c.longitude)
+                // }
             }
             Some(Err(e)) => format!("Error getting location: {e:?}"),
             None => format!("Current location is not yet available."),