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

ui: update egui library, fix images loading and view rounding

Browse source
This commit is contained in:
ardocrat 2023-10-04 16:16:30 +03:00
parent 2805c4e895
commit 8e1b131ee4
7 changed files with 135 additions and 282 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

367
Cargo.lock generated
View file

@ -23,6 +23,10 @@ name = "accesskit"
version = "0.11.2" version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8"
dependencies = [
"enumn",
"serde",
]
[[package]] [[package]]
name = "accesskit_consumer" name = "accesskit_consumer"
@ -127,7 +131,7 @@ dependencies = [
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"lazy_static", "lazy_static",
"nom 7.1.3", "nom",
"pin-project", "pin-project",
"rand 0.7.3", "rand 0.7.3",
"rand 0.8.5", "rand 0.8.5",
@ -149,7 +153,7 @@ dependencies = [
"chacha20poly1305", "chacha20poly1305",
"cookie-factory", "cookie-factory",
"hkdf", "hkdf",
"nom 7.1.3", "nom",
"rand 0.8.5", "rand 0.8.5",
"secrecy 0.8.0", "secrecy 0.8.0",
"sha2 0.9.9", "sha2 0.9.9",
@ -174,6 +178,7 @@ checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"once_cell", "once_cell",
"serde",
"version_check", "version_check",
] ]
@ -229,7 +234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f" checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f"
dependencies = [ dependencies = [
"android_log-sys", "android_log-sys",
"env_logger 0.10.0", "env_logger",
"log", "log",
"once_cell", "once_cell",
] ]
@ -458,12 +463,6 @@ version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
[[package]]
name = "atomic_refcell"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905"
[[package]] [[package]]
name = "atspi" name = "atspi"
version = "0.10.1" version = "0.10.1"
@ -580,25 +579,21 @@ checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b"
[[package]] [[package]]
name = "bindgen" name = "bindgen"
version = "0.56.0" version = "0.59.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"clap",
"env_logger 0.8.4",
"lazy_static", "lazy_static",
"lazycell", "lazycell",
"log",
"peeking_take_while", "peeking_take_while",
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
"quote 1.0.32", "quote 1.0.32",
"regex", "regex",
"rustc-hash", "rustc-hash",
"shlex", "shlex",
"which",
] ]
[[package]] [[package]]
@ -853,11 +848,11 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
[[package]] [[package]]
name = "cexpr" name = "cexpr"
version = "0.4.0" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
dependencies = [ dependencies = [
"nom 5.1.3", "nom",
] ]
[[package]] [[package]]
@ -1143,9 +1138,9 @@ dependencies = [
[[package]] [[package]]
name = "croaring" name = "croaring"
version = "0.4.6" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a00d14ad7d8cc067d7a5c93e8563791bfec3f7182361db955530db11d94ed63c" checksum = "aff1eea8a79ffa2a743c1322d5c3853d45699b7842197160c7c32a18c32c1866"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"croaring-sys", "croaring-sys",
@ -1154,9 +1149,9 @@ dependencies = [
[[package]] [[package]]
name = "croaring-sys" name = "croaring-sys"
version = "0.4.6" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5d6a46501bb403a61e43bc7cd19977b4f9c54efd703949b00259cc61afb5a86" checksum = "21d77e33a1d5e04573f79846692e72f2e02e0fdd942b90f023c45f146d3447db"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"cc", "cc",
@ -1282,17 +1277,6 @@ dependencies = [
"zeroize", "zeroize",
] ]
[[package]]
name = "d3d12"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
dependencies = [
"bitflags 1.3.2",
"libloading 0.7.4",
"winapi 0.3.9",
]
[[package]] [[package]]
name = "d3d12" name = "d3d12"
version = "0.7.0" version = "0.7.0"
@ -1485,11 +1469,12 @@ dependencies = [
[[package]] [[package]]
name = "ecolor" name = "ecolor"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e479a7fa3f23d4e794f8b2f8b3568dd4e47886ad1b12c9c095e141cb591eb63" checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde",
] ]
[[package]] [[package]]
@ -1517,9 +1502,9 @@ dependencies = [
[[package]] [[package]]
name = "eframe" name = "eframe"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf4596583a2c680c55b6feaa748f74890c4f9cb9c7cb69d6117110444cb65b2f" checksum = "26d9efede6c8905d3fc51a5ec9a506d4da4011bbcae0253d0304580fe40af3f5"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cocoa", "cocoa",
@ -1534,79 +1519,85 @@ dependencies = [
"js-sys", "js-sys",
"log", "log",
"objc", "objc",
"parking_lot 0.12.1",
"percent-encoding", "percent-encoding",
"pollster", "pollster",
"raw-window-handle", "raw-window-handle",
"static_assertions",
"thiserror", "thiserror",
"wasm-bindgen", "wasm-bindgen",
"wasm-bindgen-futures", "wasm-bindgen-futures",
"web-sys", "web-sys",
"wgpu 0.16.3", "wgpu",
"winapi 0.3.9", "winapi 0.3.9",
"winit", "winit",
] ]
[[package]] [[package]]
name = "egui" name = "egui"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3aef8ec3ae1b772f340170c65bf27d5b8c28f543a0116c844d2ac08d01123e7" checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"ahash 0.8.3", "ahash 0.8.3",
"epaint", "epaint",
"log", "log",
"nohash-hasher", "nohash-hasher",
"serde",
] ]
[[package]] [[package]]
name = "egui-wgpu" name = "egui-wgpu"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33caaedd8283779c787298af23d8754a7e88421ff32e89ad0040c855fc0b0224" checksum = "62d4c9ab93d9528c184ef1d695c8c99b2e6d50833696ec3f513063efeee0fe77"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"epaint", "epaint",
"log", "log",
"thiserror", "thiserror",
"type-map 0.5.0", "type-map 0.5.0",
"wgpu 0.16.3", "wgpu",
"winit", "winit",
] ]
[[package]] [[package]]
name = "egui-winit" name = "egui-winit"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a49155fd4a0a4fb21224407a91de0030847972ef90fc64edb63621caea61cb2" checksum = "c15479a96d9fadccf5dac690bdc6373b97b8e1c0dd28367058f25a5298da0195"
dependencies = [ dependencies = [
"accesskit_winit", "accesskit_winit",
"arboard", "arboard",
"egui", "egui",
"instant",
"log", "log",
"raw-window-handle", "raw-window-handle",
"smithay-clipboard", "smithay-clipboard",
"web-time",
"webbrowser", "webbrowser",
"winit", "winit",
] ]
[[package]] [[package]]
name = "egui_extras" name = "egui_extras"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9278f4337b526f0d57e5375e5a7340a311fa6ee8f9fcc75721ac50af13face02" checksum = "68ffe3fe5c00295f91c2a61a74ee271c32f74049c94ba0b1cea8f26eb478bc07"
dependencies = [ dependencies = [
"egui", "egui",
"enum-map",
"image", "image",
"log",
"mime_guess",
"serde", "serde",
] ]
[[package]] [[package]]
name = "egui_glow" name = "egui_glow"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f8c2752cdf1b0ef5fcda59a898cacabad974d4f5880e92a420b2c917022da64" checksum = "ce6726c08798822280038bbad2e32f4fc3cbed800cd51c6e34e99cd2d60cc1bc"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"egui", "egui",
@ -1625,11 +1616,12 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]] [[package]]
name = "emath" name = "emath"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3857d743a6e0741cdd60b622a74c7a36ea75f5f8f11b793b41d905d2c9721a4b" checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde",
] ]
[[package]] [[package]]
@ -1647,6 +1639,27 @@ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
] ]
[[package]]
name = "enum-map"
version = "2.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5"
dependencies = [
"enum-map-derive",
"serde",
]
[[package]]
name = "enum-map-derive"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25"
dependencies = [
"proc-macro2 1.0.66",
"quote 1.0.32",
"syn 2.0.28",
]
[[package]] [[package]]
name = "enum_primitive" name = "enum_primitive"
version = "0.1.1" version = "0.1.1"
@ -1678,16 +1691,14 @@ dependencies = [
] ]
[[package]] [[package]]
name = "env_logger" name = "enumn"
version = "0.8.4" version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b"
dependencies = [ dependencies = [
"atty", "proc-macro2 1.0.66",
"humantime 2.1.0", "quote 1.0.32",
"log", "syn 2.0.28",
"regex",
"termcolor",
] ]
[[package]] [[package]]
@ -1705,19 +1716,19 @@ dependencies = [
[[package]] [[package]]
name = "epaint" name = "epaint"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09333964d4d57f40a85338ba3ca5ed4716070ab184dcfed966b35491c5c64f3b" checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e"
dependencies = [ dependencies = [
"ab_glyph", "ab_glyph",
"ahash 0.8.3", "ahash 0.8.3",
"atomic_refcell",
"bytemuck", "bytemuck",
"ecolor", "ecolor",
"emath", "emath",
"log", "log",
"nohash-hasher", "nohash-hasher",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"serde",
] ]
[[package]] [[package]]
@ -2248,16 +2259,6 @@ dependencies = [
"gl_generator", "gl_generator",
] ]
[[package]]
name = "gpu-alloc"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
dependencies = [
"bitflags 1.3.2",
"gpu-alloc-types 0.2.0",
]
[[package]] [[package]]
name = "gpu-alloc" name = "gpu-alloc"
version = "0.6.0" version = "0.6.0"
@ -2265,16 +2266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
dependencies = [ dependencies = [
"bitflags 2.4.0", "bitflags 2.4.0",
"gpu-alloc-types 0.3.0", "gpu-alloc-types",
]
[[package]]
name = "gpu-alloc-types"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
dependencies = [
"bitflags 1.3.2",
] ]
[[package]] [[package]]
@ -2332,7 +2324,7 @@ dependencies = [
"eframe", "eframe",
"egui", "egui",
"egui_extras", "egui_extras",
"env_logger 0.10.0", "env_logger",
"futures 0.3.28", "futures 0.3.28",
"grin_api", "grin_api",
"grin_chain", "grin_chain",
@ -2362,7 +2354,6 @@ dependencies = [
"tokio-util 0.7.8", "tokio-util 0.7.8",
"toml 0.7.6", "toml 0.7.6",
"url", "url",
"wgpu 0.17.0",
"winit", "winit",
] ]
@ -3608,20 +3599,6 @@ dependencies = [
"autocfg 1.1.0", "autocfg 1.1.0",
] ]
[[package]]
name = "metal"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
dependencies = [
"bitflags 1.3.2",
"block",
"core-graphics-types",
"foreign-types 0.3.2",
"log",
"objc",
]
[[package]] [[package]]
name = "metal" name = "metal"
version = "0.26.0" version = "0.26.0"
@ -3744,26 +3721,6 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "naga"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
dependencies = [
"bit-set",
"bitflags 1.3.2",
"codespan-reporting",
"hexf-parse",
"indexmap 1.9.3",
"log",
"num-traits 0.2.16",
"rustc-hash",
"spirv",
"termcolor",
"thiserror",
"unicode-xid 0.2.4",
]
[[package]] [[package]]
name = "naga" name = "naga"
version = "0.13.0" version = "0.13.0"
@ -3898,16 +3855,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
[[package]]
name = "nom"
version = "5.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b"
dependencies = [
"memchr",
"version_check",
]
[[package]] [[package]]
name = "nom" name = "nom"
version = "7.1.3" version = "7.1.3"
@ -5539,9 +5486,9 @@ dependencies = [
[[package]] [[package]]
name = "shlex" name = "shlex"
version = "0.1.1" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
[[package]] [[package]]
name = "signal-hook" name = "signal-hook"
@ -6631,6 +6578,17 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "web-time"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19353897b48e2c4d849a2d73cb0aeb16dc2be4e00c565abfc11eb65a806e47de"
dependencies = [
"js-sys",
"once_cell",
"wasm-bindgen",
]
[[package]] [[package]]
name = "webbrowser" name = "webbrowser"
version = "0.8.10" version = "0.8.10"
@ -6675,15 +6633,15 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
[[package]] [[package]]
name = "wgpu" name = "wgpu"
version = "0.16.3" version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" checksum = "ed547920565c56c7a29afb4538ac5ae5048865a5d2f05bff3ad4fbeb921a9a2c"
dependencies = [ dependencies = [
"arrayvec 0.7.4", "arrayvec 0.7.4",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"js-sys", "js-sys",
"log", "log",
"naga 0.12.3", "naga",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"profiling", "profiling",
"raw-window-handle", "raw-window-handle",
@ -6692,47 +6650,23 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
"wasm-bindgen-futures", "wasm-bindgen-futures",
"web-sys", "web-sys",
"wgpu-core 0.16.1", "wgpu-core",
"wgpu-hal 0.16.2", "wgpu-hal",
"wgpu-types 0.16.1", "wgpu-types",
]
[[package]]
name = "wgpu"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7472f3b69449a8ae073f6ec41d05b6f846902d92a6c45313c50cb25857b736ce"
dependencies = [
"arrayvec 0.7.4",
"cfg-if 1.0.0",
"js-sys",
"log",
"naga 0.13.0",
"parking_lot 0.12.1",
"profiling",
"raw-window-handle",
"smallvec",
"static_assertions",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
"wgpu-core 0.17.0",
"wgpu-hal 0.17.0",
"wgpu-types 0.17.0",
] ]
[[package]] [[package]]
name = "wgpu-core" name = "wgpu-core"
version = "0.16.1" version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7"
dependencies = [ dependencies = [
"arrayvec 0.7.4", "arrayvec 0.7.4",
"bit-vec", "bit-vec",
"bitflags 2.4.0", "bitflags 2.4.0",
"codespan-reporting", "codespan-reporting",
"log", "log",
"naga 0.12.3", "naga",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"profiling", "profiling",
"raw-window-handle", "raw-window-handle",
@ -6740,38 +6674,15 @@ dependencies = [
"smallvec", "smallvec",
"thiserror", "thiserror",
"web-sys", "web-sys",
"wgpu-hal 0.16.2", "wgpu-hal",
"wgpu-types 0.16.1", "wgpu-types",
]
[[package]]
name = "wgpu-core"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecf7454d9386f602f7399225c92dd2fbdcde52c519bc8fb0bd6fbeb388075dc2"
dependencies = [
"arrayvec 0.7.4",
"bit-vec",
"bitflags 2.4.0",
"codespan-reporting",
"log",
"naga 0.13.0",
"parking_lot 0.12.1",
"profiling",
"raw-window-handle",
"rustc-hash",
"smallvec",
"thiserror",
"web-sys",
"wgpu-hal 0.17.0",
"wgpu-types 0.17.0",
] ]
[[package]] [[package]]
name = "wgpu-hal" name = "wgpu-hal"
version = "0.16.2" version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17"
dependencies = [ dependencies = [
"android_system_properties", "android_system_properties",
"arrayvec 0.7.4", "arrayvec 0.7.4",
@ -6780,10 +6691,9 @@ dependencies = [
"bitflags 2.4.0", "bitflags 2.4.0",
"block", "block",
"core-graphics-types", "core-graphics-types",
"d3d12 0.6.0", "d3d12",
"foreign-types 0.3.2",
"glow", "glow",
"gpu-alloc 0.5.4", "gpu-alloc",
"gpu-allocator", "gpu-allocator",
"gpu-descriptor", "gpu-descriptor",
"hassle-rs", "hassle-rs",
@ -6792,8 +6702,8 @@ dependencies = [
"libc", "libc",
"libloading 0.8.0", "libloading 0.8.0",
"log", "log",
"metal 0.24.0", "metal",
"naga 0.12.3", "naga",
"objc", "objc",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"profiling", "profiling",
@ -6805,62 +6715,10 @@ dependencies = [
"thiserror", "thiserror",
"wasm-bindgen", "wasm-bindgen",
"web-sys", "web-sys",
"wgpu-types 0.16.1", "wgpu-types",
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "wgpu-hal"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6654a13885a17f475e8324efb46dc6986d7aaaa98353330f8de2077b153d0101"
dependencies = [
"android_system_properties",
"arrayvec 0.7.4",
"ash",
"bit-set",
"bitflags 2.4.0",
"block",
"core-graphics-types",
"d3d12 0.7.0",
"glow",
"gpu-alloc 0.6.0",
"gpu-allocator",
"gpu-descriptor",
"hassle-rs",
"js-sys",
"khronos-egl",
"libc",
"libloading 0.8.0",
"log",
"metal 0.26.0",
"naga 0.13.0",
"objc",
"parking_lot 0.12.1",
"profiling",
"range-alloc",
"raw-window-handle",
"renderdoc-sys",
"rustc-hash",
"smallvec",
"thiserror",
"wasm-bindgen",
"web-sys",
"wgpu-types 0.17.0",
"winapi 0.3.9",
]
[[package]]
name = "wgpu-types"
version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
dependencies = [
"bitflags 2.4.0",
"js-sys",
"web-sys",
]
[[package]] [[package]]
name = "wgpu-types" name = "wgpu-types"
version = "0.17.0" version = "0.17.0"
@ -6872,15 +6730,6 @@ dependencies = [
"web-sys", "web-sys",
] ]
[[package]]
name = "which"
version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
dependencies = [
"libc",
]
[[package]] [[package]]
name = "widestring" name = "widestring"
version = "1.0.2" version = "1.0.2"
@ -7237,7 +7086,7 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7"
dependencies = [ dependencies = [
"nom 7.1.3", "nom",
] ]
[[package]] [[package]]

9
Cargo.toml
View file

@ -33,9 +33,8 @@ grin_wallet_util = { git = "https://github.com/mimblewimble/grin-wallet", tag =
grin_wallet_controller = { git = "https://github.com/mimblewimble/grin-wallet", tag = "v5.2.0-beta.1" } grin_wallet_controller = { git = "https://github.com/mimblewimble/grin-wallet", tag = "v5.2.0-beta.1" }
## ui ## ui
wgpu = "0.17.0" egui = { version = "0.23.0", default-features = false }
egui = { version = "0.22.0", default-features = false } egui_extras = { version = "0.23.0", features = ["image"] }
egui_extras = { version = "0.22.0", features = ["image"] }
rust-i18n = "2.1.0" rust-i18n = "2.1.0"
## other ## other
@ -62,7 +61,7 @@ built = { version = "0.6.0", features = ["git2"]}
[target.'cfg(not(target_os = "android"))'.dependencies] [target.'cfg(not(target_os = "android"))'.dependencies]
env_logger = "0.10.0" env_logger = "0.10.0"
winit = { version = "0.28" } winit = { version = "0.28" }
eframe = { version = "0.22.0", features = [ "wgpu" ] } eframe = { version = "0.23.0", features = [ "wgpu" ] }
arboard = "3.2.0" arboard = "3.2.0"
[target.'cfg(target_os = "android")'.dependencies] [target.'cfg(target_os = "android")'.dependencies]
@ -70,4 +69,4 @@ android_logger = "0.13.1"
jni = "0.21.1" jni = "0.21.1"
android-activity = "0.4.3" android-activity = "0.4.3"
winit = { version = "0.28", features = [ "android-game-activity" ] } winit = { version = "0.28", features = [ "android-game-activity" ] }
eframe = { version = "0.22.0", features = [ "wgpu", "android-game-activity" ] } eframe = { version = "0.23.0", features = [ "wgpu", "android-game-activity" ] }

2
src/config.rs
View file

@ -37,7 +37,7 @@ impl Default for AppConfig {
Self { Self {
auto_start_node: false, auto_start_node: false,
chain_type: ChainTypes::default(), chain_type: ChainTypes::default(),
show_wallets_at_dual_panel: true, show_wallets_at_dual_panel: false,
show_connections_network_panel: false, show_connections_network_panel: false,
} }
} }

6
src/gui/views/modal.rs
View file

@ -15,7 +15,7 @@
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::RwLock; use std::sync::RwLock;
use egui::{Align2, RichText, Rounding, Stroke, Vec2}; use egui::{Align2, Rect, RichText, Rounding, Stroke, Vec2};
use egui::epaint::RectShape; use egui::epaint::RectShape;
use lazy_static::lazy_static; use lazy_static::lazy_static;
@ -236,6 +236,8 @@ impl Modal {
rounding, rounding,
fill: Colors::FILL, fill: Colors::FILL,
stroke: Stroke::NONE, stroke: Stroke::NONE,
fill_texture_id: Default::default(),
uv: Rect::ZERO
}; };
let bg_idx = ui.painter().add(bg_shape); let bg_idx = ui.painter().add(bg_shape);
@ -266,6 +268,8 @@ impl Modal {
}, },
fill: Colors::YELLOW, fill: Colors::YELLOW,
stroke: Stroke::NONE, stroke: Stroke::NONE,
fill_texture_id: Default::default(),
uv: Rect::ZERO
}; };
let bg_idx = ui.painter().add(bg_shape); let bg_idx = ui.painter().add(bg_shape);

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

@ -14,7 +14,7 @@
use std::sync::atomic::{AtomicI32, Ordering}; use std::sync::atomic::{AtomicI32, Ordering};
use egui::{Button, CursorIcon, PointerState, Response, RichText, Sense, Spinner, Widget}; use egui::{Button, CursorIcon, PointerState, Rect, Response, RichText, Sense, Spinner, Widget};
use egui::epaint::{CircleShape, Color32, FontId, RectShape, Rounding, Stroke}; use egui::epaint::{CircleShape, Color32, FontId, RectShape, Rounding, Stroke};
use egui::epaint::text::TextWrapping; use egui::epaint::text::TextWrapping;
use egui::text::{LayoutJob, TextFormat}; use egui::text::{LayoutJob, TextFormat};
@ -325,6 +325,8 @@ impl View {
}, },
fill: Colors::TRANSPARENT, fill: Colors::TRANSPARENT,
stroke: Self::ITEM_STROKE, stroke: Self::ITEM_STROKE,
fill_texture_id: Default::default(),
uv: Rect::ZERO
}; };
let bg_idx = ui.painter().add(bg_shape); let bg_idx = ui.painter().add(bg_shape);

14
src/gui/views/wallets/creation/creation.rs
View file

@ -44,10 +44,7 @@ pub struct WalletCreation {
/// Mnemonic phrase setup content. /// Mnemonic phrase setup content.
pub(crate) mnemonic_setup: MnemonicSetup, pub(crate) mnemonic_setup: MnemonicSetup,
/// Network setup content. /// Network setup content.
pub(crate) network_setup: ConnectionSetup, pub(crate) network_setup: ConnectionSetup
/// App logo image.
logo: RetainedImage,
} }
impl Default for WalletCreation { impl Default for WalletCreation {
@ -59,11 +56,7 @@ impl Default for WalletCreation {
pass_edit: String::from(""), pass_edit: String::from(""),
hide_pass: true, hide_pass: true,
mnemonic_setup: MnemonicSetup::default(), mnemonic_setup: MnemonicSetup::default(),
network_setup: ConnectionSetup::default(), network_setup: ConnectionSetup::default()
logo: RetainedImage::from_image_bytes(
"logo.png",
include_bytes!("../../../../../img/logo.png"),
).unwrap()
} }
} }
} }
@ -220,7 +213,8 @@ impl WalletCreation {
// Show wallet creation message if step is empty. // Show wallet creation message if step is empty.
View::center_content(ui, 415.0 + View::get_bottom_inset(), |ui| { View::center_content(ui, 415.0 + View::get_bottom_inset(), |ui| {
ui.add( ui.add(
egui::Image::new(self.logo.texture_id(ui.ctx()), vec2(200.0, 200.0)) egui::Image::new(egui::include_image!("../../../../../img/logo.png"))
.fit_to_exact_size(vec2(200.0, 200.0))
); );
ui.add_space(-15.0); ui.add_space(-15.0);
ui.label(RichText::new("GRIM") ui.label(RichText::new("GRIM")

15
src/lib.rs
View file

@ -15,13 +15,18 @@
#[macro_use] #[macro_use]
extern crate rust_i18n; extern crate rust_i18n;
use eframe::wgpu;
use egui::{Context, Stroke}; use egui::{Context, Stroke};
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
use winit::platform::android::activity::AndroidApp; use winit::platform::android::activity::AndroidApp;
pub use config::AppConfig;
pub use settings::Settings;
use crate::gui::{Colors, PlatformApp}; use crate::gui::{Colors, PlatformApp};
use crate::gui::platform::PlatformCallbacks; use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::View;
use crate::node::Node; use crate::node::Node;
i18n!("locales"); i18n!("locales");
@ -30,12 +35,7 @@ mod node;
mod wallet; mod wallet;
mod settings; mod settings;
pub use settings::Settings;
mod config; mod config;
pub use config::AppConfig;
use crate::gui::views::View;
pub mod gui; pub mod gui;
// Include build information. // Include build information.
@ -87,8 +87,13 @@ fn android_main(app: AndroidApp) {
pub fn app_creator<T: 'static>(app: PlatformApp<T>) -> eframe::AppCreator pub fn app_creator<T: 'static>(app: PlatformApp<T>) -> eframe::AppCreator
where PlatformApp<T>: eframe::App, T: PlatformCallbacks { where PlatformApp<T>: eframe::App, T: PlatformCallbacks {
Box::new(|cc| { Box::new(|cc| {
// Setup images support.
egui_extras::install_image_loaders(&cc.egui_ctx);
// Setup visuals.
setup_visuals(&cc.egui_ctx); setup_visuals(&cc.egui_ctx);
// Setup fonts.
setup_fonts(&cc.egui_ctx); setup_fonts(&cc.egui_ctx);
// Return app instance.
Box::new(app) Box::new(app)
}) })
} }