summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaxVerevkin <maxxverrr@gmail.com>2023-04-20 17:34:49 +0300
committerMaxVerevkin <maxxverrr@gmail.com>2023-04-20 17:34:49 +0300
commita605021fe95716264ac1d2a03248f36b64a6fa21 (patch)
treedf7e12b299fff22f6ca9f847cb7232db5a3945e4 /src
parent08a5f2a976c4c71aad2011a01fff5782fd5e23e7 (diff)
downloadi3bar-mango-a605021fe95716264ac1d2a03248f36b64a6fa21.tar.gz
update deps
Diffstat (limited to 'src')
-rw-r--r--src/bar.rs6
-rw-r--r--src/state.rs2
-rw-r--r--src/text.rs2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/bar.rs b/src/bar.rs
index fe6e305..19ff8ac 100644
--- a/src/bar.rs
+++ b/src/bar.rs
@@ -1,7 +1,6 @@
use pangocairo::cairo;
use wayrs_client::connection::Connection;
-use wayrs_client::proxy::Proxy;
use wayrs_utils::shm_alloc::BufferSpec;
use crate::blocks_cache::ComputedBlock;
@@ -234,7 +233,8 @@ impl Bar {
self.viewport
.set_destination(conn, self.width as i32, self.height as i32);
- self.surface.attach(conn, buffer.into_wl_buffer(), 0, 0);
+ self.surface
+ .attach(conn, Some(buffer.into_wl_buffer()), 0, 0);
self.surface.damage(conn, 0, 0, i32::MAX, i32::MAX);
self.surface.commit(conn);
}
@@ -283,7 +283,7 @@ impl Bar {
pub fn hide(&mut self, conn: &mut Connection<State>) {
self.hidden = true;
self.mapped = false;
- self.surface.attach(conn, WlBuffer::null(), 0, 0);
+ self.surface.attach(conn, None, 0, 0);
self.surface.commit(conn);
}
}
diff --git a/src/state.rs b/src/state.rs
index 86eb45d..5476f6c 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -152,7 +152,7 @@ impl State {
let layer_surface = self.layer_shell.get_layer_surface_with_cb(
conn,
surface,
- output,
+ Some(output),
zwlr_layer_shell_v1::Layer::Top,
wayrs_client::cstr!("i3bar-river").into(),
layer_surface_cb,
diff --git a/src/text.rs b/src/text.rs
index dcad438..61bf5ca 100644
--- a/src/text.rs
+++ b/src/text.rs
@@ -60,7 +60,7 @@ impl ComputedText {
pub fn new(text: &str, mut attr: Attributes) -> Self {
let text = text.replace('\n', "\u{23CE}");
- let layout = PANGO_CTX.with(|ctx| pango::Layout::new(ctx));
+ let layout = PANGO_CTX.with(pango::Layout::new);
layout.set_font_description(Some(attr.font));
if attr.markup {
layout.set_markup(&text);