From bb0c42e92f5e5a50f1e4a5ef913f17981db7e99f Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 27 Feb 2024 10:02:01 -0700 Subject: [PATCH] Update dependencies --- Cargo.lock | 42 +++++++++++++++++++++--------------------- src/main.rs | 12 ++++++------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bbfcb8f..de35b1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1147,7 +1147,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1164,7 +1164,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "quote", "syn 1.0.109", @@ -1201,7 +1201,7 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files#5778d64e8cc8540221459e4b3c463da9bf2ee60b" +source = "git+https://github.com/pop-os/cosmic-files#9b22c8f9edbcde8e992339bd115f68792c30e314" dependencies = [ "chrono", "dirs", @@ -1263,7 +1263,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "almost", "cosmic-config", @@ -1794,9 +1794,9 @@ dependencies = [ [[package]] name = "error-code" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a147e1a6641a55d994b3e4e9fa4d9b180c8d652c09b363af8c9bf1b8e04139" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "etagere" @@ -2802,7 +2802,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "iced_accessibility", "iced_core", @@ -2817,7 +2817,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "accesskit", "accesskit_winit", @@ -2826,7 +2826,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "bitflags 1.3.2", "log", @@ -2843,7 +2843,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "futures", "iced_core", @@ -2856,7 +2856,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2880,7 +2880,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2892,7 +2892,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "iced_core", "iced_futures", @@ -2902,7 +2902,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "iced_core", "once_cell", @@ -2912,7 +2912,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "bytemuck", "cosmic-text", @@ -2929,7 +2929,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2948,7 +2948,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "iced_renderer", "iced_runtime", @@ -2962,7 +2962,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "iced_graphics", "iced_runtime", @@ -3314,7 +3314,7 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#94905c52010ef5b9bcbc3fe4d4e482b4f29b18ce" +source = "git+https://github.com/pop-os/libcosmic#7abfef4eed01af0eda1a0bd8775e49e31a789a57" dependencies = [ "apply", "ashpd", @@ -4693,9 +4693,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "rangemap" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "795915a3930a5d6bafd9053d37602fea3e61be2e5d4d788983a8ba9654c1c6f2" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" [[package]] name = "raw-window-handle" diff --git a/src/main.rs b/src/main.rs index 2355285..c771b60 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2212,12 +2212,12 @@ impl Application for App { if self.config.line_numbers { text_box = text_box.line_numbers(); } - let mut popover = - widget::popover(text_box, menu::context_menu(&self.key_binds, tab_id)); - popover = match tab.context_menu { - Some(position) => popover.position(position), - None => popover.show_popup(false), - }; + let mut popover = widget::popover(text_box); + if let Some(position) = tab.context_menu { + popover = popover + .popup(menu::context_menu(&self.key_binds, tab_id)) + .position(position); + } tab_column = tab_column.push(popover); if !status.is_empty() { tab_column = tab_column.push(text(status).font(Font::MONOSPACE));