M Cargo.lock => Cargo.lock +7 -5
@@ 1,5 1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
+version = 3
+
[[package]]
name = "anyhow"
version = "1.0.36"
@@ 383,7 385,7 @@ dependencies = [
[[package]]
name = "hirogen"
-version = "1.0.1"
+version = "1.0.2"
dependencies = [
"cairo-rs",
"gdk",
@@ 644,18 646,18 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.22"
+version = "1.0.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.22"
+version = "1.0.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
dependencies = [
"proc-macro2",
"quote",
M Cargo.toml => Cargo.toml +4 -3
@@ 15,8 15,9 @@ memmap = "^0"
[dependencies.gtk]
version = "0.9.0"
-features = ["v3_16"]
+features = ["v3_22"]
[dependencies.gio]
-version = ""
-features = ["v2_44"]
+version = "0.9.0"
+features = ["v2_56"]
+
M src/app.rs => src/app.rs +1 -0
@@ 8,6 8,7 @@
use crate::document_window::*;
use crate::guard_unwrap;
use gio::prelude::*;
+use gio::ApplicationExt;
use gtk::prelude::*;
use gtk::{
DialogExt,
M src/document.rs => src/document.rs +1 -1
@@ 659,7 659,7 @@ impl Document
{
num_bytes_in_row: usize,
origin_y: f64,
- };
+ }
let calc_row_ctx = |i: usize| -> RowCtx {
let num_bytes_in_row =
M src/document_window.rs => src/document_window.rs +4 -3
@@ 14,6 14,7 @@ use gdk::prelude::*;
use gdk::keys::constants as keys;
use gio::prelude::*;
+use gio::prelude::ApplicationExt;
use gdk::{
EventButton,
EventCrossing,
@@ 1134,7 1135,7 @@ impl DocumentWindow
glib::timeout_add_local(250, move || {
let app = match weak_app.upgrade() {
Some(app) => app,
- None => return Continue(false)
+ None => return glib::source::Continue(false)
};
let mut state = app.state.borrow_mut();
@@ 1144,10 1145,10 @@ impl DocumentWindow
let vadj = &app.hex_adjustment;
vadj.set_value(vadj.get_value() + scroll_velocity);
- Continue(true)
+ glib::source::Continue(true)
} else {
state.timer_active = false;
- Continue(false)
+ glib::source::Continue(false)
}
});
}