#272 fixing text offset

sminez · Jul 15, 2023 · 76d83a6 · 76d83a6
1 parent a2f1baf
commit 76d83a6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -30,7 +30,7 @@ jobs:
         rust-version: ${{ matrix.rust }}
 
     - name: Install C deps
-      run: sudo apt-get update && sudo apt-get install -y libxrandr-dev libx11-xcb-dev libxcb-randr0-dev libpango1.0-dev libcairo2-dev --fix-missing
+      run: sudo apt-get update && sudo apt-get install -y libxrandr-dev libx11-xcb-dev libxcb-randr0-dev --fix-missing
 
     - name: Run tests
       run: cargo test --workspace --features ${{ matrix.features }} --verbose
@@ -55,7 +55,7 @@ jobs:
     - uses: hecrj/setup-rust-action@v1
       with:
         components: clippy
-    - run: sudo apt-get update && sudo apt-get install -y libxrandr-dev libx11-xcb-dev libxcb-randr0-dev libpango1.0-dev libcairo2-dev --fix-missing
+    - run: sudo apt-get update && sudo apt-get install -y libxrandr-dev libx11-xcb-dev libxcb-randr0-dev --fix-missing
     - uses: actions-rs/clippy-check@v1
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
@@ -70,5 +70,5 @@ jobs:
     - uses: hecrj/setup-rust-action@v1
       with:
         rust-version: nightly
-    - run: sudo apt-get update && sudo apt-get install -y libxrandr-dev libx11-xcb-dev libxcb-randr0-dev libpango1.0-dev libcairo2-dev --fix-missing
+    - run: sudo apt-get update && sudo apt-get install -y libxrandr-dev libx11-xcb-dev libxcb-randr0-dev --fix-missing
     - run: cargo rustdoc --all-features
diff --git a/crates/penrose_ui/src/bar/widgets/mod.rs b/crates/penrose_ui/src/bar/widgets/mod.rs
@@ -142,9 +142,6 @@ impl<X: XConn> Widget<X> for Text {
         }
 
         let (ew, eh) = <Self as Widget<X>>::current_extent(self, ctx, h)?;
-        // ctx.font(&self.font, self.point_size)?;
-        // ctx.color(&self.fg);
-
         let offset = w as i32 - ew as i32;
         let right_justify = self.right_justified && self.is_greedy && offset > 0;
         if right_justify {
@@ -165,7 +162,6 @@ impl<X: XConn> Widget<X> for Text {
             Some(extent) => Ok(extent),
             None => {
                 let (l, r) = self.padding;
-                // ctx.font(&self.font, self.point_size)?;
                 let (w, h) = ctx.text_extent(&self.txt)?;
                 let extent = (w + l + r, h);
                 self.extent = Some(extent);

diff --git a/crates/penrose_ui/src/core/mod.rs b/crates/penrose_ui/src/core/mod.rs
@@ -216,7 +216,7 @@ impl<'a> Context<'a> {
     /// Render a rectangular border using the supplied color.
     pub fn draw_rect(&mut self, Rect { x, y, w, h }: Rect, color: Color) -> Result<()> {
         let xcol = self.get_or_try_init_xcolor(color)?;
-        let (x, y) = (x as i32, y as i32);
+        let (x, y) = (self.dx + x as i32, self.dy + y as i32);
 
         unsafe {
             XSetForeground(self.dpy, self.s.gc, (*xcol).pixel);
@@ -229,7 +229,7 @@ impl<'a> Context<'a> {
     /// Render a filled rectangle using the supplied color.
     pub fn fill_rect(&mut self, Rect { x, y, w, h }: Rect, color: Color) -> Result<()> {
         let xcol = self.get_or_try_init_xcolor(color)?;
-        let (x, y) = (x as i32, y as i32);
+        let (x, y) = (self.dx + x as i32, self.dy + y as i32);
 
         unsafe {
             XSetForeground(self.dpy, self.s.gc, (*xcol).pixel);
@@ -261,7 +261,7 @@ impl<'a> Context<'a> {
         };
 
         let (lpad, rpad) = (padding.0 as i32, padding.1);
-        let (mut x, y) = (lpad + self.dx, self.dy + h_offset as i32);
+        let (mut x, y) = (lpad + self.dx, self.dy);
         let (mut total_w, mut total_h) = (x as u32, 0);
         let xcol = self.get_or_try_init_xcolor(c)?;
 
@@ -270,7 +270,7 @@ impl<'a> Context<'a> {
             let (chunk_w, chunk_h) = fnt.get_exts(self.dpy, chunk)?;
 
             // SAFETY: fnt pointer is non-null
-            let chunk_y = unsafe { y + (h_offset + chunk_h) as i32 / 2 + (*fnt.xfont).ascent };
+            let chunk_y = unsafe { y + h_offset as i32 + (*fnt.xfont).ascent };
             let c_str = CString::new(chunk)?;
 
             unsafe {