GUI/grim
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases 9 Packages Wiki Activity Actions

build: update egui to last github version
Some checks failed
Build / Linux Build (push) Has been cancelled
Details
Build / Windows Build (push) Has been cancelled
Details
Build / MacOS Build (push) Has been cancelled
Details

Browse source
This commit is contained in:
ardocrat 2025-06-25 13:13:31 +03:00
parent 1b78118f51
commit cf4f0789a3
5 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Cargo.lock generated
View file

@ -2260,7 +2260,7 @@ dependencies = [
[[package]]
name = "ecolor"
version = "0.31.1"
source = "git+https://github.com/ardocrat/egui?branch=back_button_android#1d498ae5660c5990e3caa9525f75bb9355e50e50"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"bytemuck",
"emath",
@ -2330,7 +2330,7 @@ dependencies = [
[[package]]
name = "eframe"
version = "0.31.1"
source = "git+https://github.com/ardocrat/egui?branch=back_button_android#1d498ae5660c5990e3caa9525f75bb9355e50e50"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"ahash",
"bytemuck",
@ -2364,7 +2364,7 @@ dependencies = [
[[package]]
name = "egui"
version = "0.31.1"
source = "git+https://github.com/ardocrat/egui?branch=back_button_android#1d498ae5660c5990e3caa9525f75bb9355e50e50"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"ahash",
"bitflags 2.9.1",
@ -2373,13 +2373,14 @@ dependencies = [
"log",
"nohash-hasher",
"profiling",
"smallvec",
"unicode-segmentation",
]
[[package]]
name = "egui-winit"
version = "0.31.1"
source = "git+https://github.com/ardocrat/egui?branch=back_button_android#1d498ae5660c5990e3caa9525f75bb9355e50e50"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"ahash",
"arboard",
@ -2397,7 +2398,7 @@ dependencies = [
[[package]]
name = "egui_extras"
version = "0.31.1"
source = "git+https://github.com/ardocrat/egui?branch=back_button_android#1d498ae5660c5990e3caa9525f75bb9355e50e50"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"ahash",
"egui",
@ -2412,7 +2413,7 @@ dependencies = [
[[package]]
name = "egui_glow"
version = "0.31.1"
source = "git+https://github.com/ardocrat/egui?branch=back_button_android#1d498ae5660c5990e3caa9525f75bb9355e50e50"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"ahash",
"bytemuck",
@ -2453,7 +2454,7 @@ dependencies = [
[[package]]
name = "emath"
version = "0.31.1"
source = "git+https://github.com/ardocrat/egui?branch=back_button_android#1d498ae5660c5990e3caa9525f75bb9355e50e50"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"bytemuck",
]
@ -2568,7 +2569,7 @@ dependencies = [
[[package]]
name = "epaint"
version = "0.31.1"
source = "git+https://github.com/ardocrat/egui?branch=back_button_android#1d498ae5660c5990e3caa9525f75bb9355e50e50"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"ab_glyph",
"ahash",

6
Cargo.toml
View file

@ -154,8 +154,8 @@ winit = { version = "0.30.11", features = ["android-native-activity"] }
eframe = { version = "0.31.1", default-features = false, features = ["glow", "android-native-activity"] }
[patch.crates-io]
egui_extras = { git = "https://github.com/ardocrat/egui", branch = "back_button_android" }
egui = { git = "https://github.com/ardocrat/egui", branch = "back_button_android" }
eframe = { git = "https://github.com/ardocrat/egui", branch = "back_button_android" }
egui_extras = { git = "https://github.com/emilk/egui", rev = "f11a3510ba07ae87747d744d952676476a88c24e" }
egui = { git = "https://github.com/emilk/egui", rev = "f11a3510ba07ae87747d744d952676476a88c24e" }
eframe = { git = "https://github.com/emilk/egui", rev = "f11a3510ba07ae87747d744d952676476a88c24e" }
### patch grin store
#grin_store = { path = "../grin-store" }

8
src/gui/views/qr.rs
View file

@ -269,8 +269,12 @@ impl QrCodeContent {
// Draw QR code image.
let mut content_rect = ui.scope_builder(UiBuilder::new().max_rect(rect), |ui| {
ui.add_space(10.0);
let size = SizeHint::Size(ui.available_width() as u32, ui.available_width() as u32);
self.texture_handle = Some(View::svg_image(ui, "qr", svg.as_slice(), Some(size)));
let size = SizeHint::Size {
width: ui.available_width() as u32,
height: ui.available_width() as u32,
maintain_aspect_ratio: true,
};
self.texture_handle = Some(View::svg_image(ui, "qr", svg.as_slice(), size));
ui.add_space(10.0);
}).response.rect;

2
src/gui/views/views.rs
View file

@ -565,7 +565,7 @@ impl View {
pub fn svg_image(ui: &mut egui::Ui,
name: &str,
svg: &[u8],
size: Option<SizeHint>) -> TextureHandle {
size: SizeHint) -> TextureHandle {
let color_img = load_svg_bytes_with_size(svg, size, &usvg::Options::default()).unwrap();
// Create image texture.
let texture_handle = ui.ctx().load_texture(name,

2
src/gui/views/wallets/wallet/txs/tx.rs
View file

@ -22,7 +22,7 @@ use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::wallets::wallet::txs::WalletTransactions;
use crate::gui::views::{CameraContent, FilePickContent, FilePickContentType, Modal, QrCodeContent, View};
use crate::gui::Colors;
use crate::wallet::types::{WalletTask, WalletTransaction, WalletTransactionAction};
use crate::wallet::types::{WalletTask, WalletTransaction};
use crate::wallet::Wallet;
/// Transaction information [`Modal`] content.