From 8fb807af34121e6ce0c07ef4e762fcc5533362c7 Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Tue, 2 Apr 2024 12:26:16 +0100 Subject: [PATCH] table adjustments (still not appearing) and button text fixes --- Cargo.lock | 223 ++++++++++---------- crates/core/src/style/table_row.rs | 9 +- crates/core/src/theme/button.rs | 6 +- crates/core/src/theme/container.rs | 1 + crates/core/src/widget/table_row.rs | 8 +- src/gui/element/mod.rs | 2 +- src/gui/element/wallet/operation/open.rs | 17 +- src/gui/element/wallet/setup/wallet_list.rs | 17 +- 8 files changed, 143 insertions(+), 140 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2627a03..1c4501a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -281,16 +281,16 @@ checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener-strategy 0.5.1", "futures-core", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "10b3e585719c2358d2660232671ca8ca4ddb4be4ce8a1842d6c2dc8685303316" dependencies = [ "async-lock 3.3.0", "async-task", @@ -322,7 +322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock 2.8.0", - "autocfg 1.1.0", + "autocfg 1.2.0", "cfg-if 1.0.0", "concurrent-queue", "futures-lite 1.13.0", @@ -371,7 +371,7 @@ checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ "event-listener 4.0.3", "event-listener-strategy 0.4.0", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] @@ -430,7 +430,7 @@ dependencies = [ "log", "memchr", "once_cell", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "pin-utils", "slab", "wasm-bindgen-futures", @@ -477,14 +477,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" @@ -732,7 +732,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -914,9 +914,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1330,7 +1330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", - "itoa 1.0.10", + "itoa 1.0.11", "ryu", "serde", ] @@ -1360,7 +1360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -1593,7 +1593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "redox_users 0.4.4", + "redox_users 0.4.5", "winapi 0.3.9", ] @@ -1604,7 +1604,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.4", + "redox_users 0.4.5", "winapi 0.3.9", ] @@ -1622,7 +1622,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -1837,7 +1837,7 @@ checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" dependencies = [ "concurrent-queue", "parking", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] @@ -1848,7 +1848,7 @@ checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ "concurrent-queue", "parking", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] @@ -1859,7 +1859,7 @@ checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" dependencies = [ "concurrent-queue", "parking", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] @@ -1869,17 +1869,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ "event-listener 4.0.3", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" dependencies = [ "event-listener 5.2.0", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] @@ -2107,7 +2107,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -2250,7 +2250,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "waker-fn", ] @@ -2264,7 +2264,7 @@ dependencies = [ "futures-core", "futures-io", "parking", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] @@ -2275,7 +2275,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -2303,7 +2303,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "pin-utils", "slab", ] @@ -3202,7 +3202,7 @@ dependencies = [ "http", "indexmap 2.2.6", "slab", - "tokio 1.36.0", + "tokio 1.37.0", "tokio-util 0.7.10", "tracing", ] @@ -3330,7 +3330,7 @@ checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes 1.6.0", "fnv", - "itoa 1.0.10", + "itoa 1.0.11", ] [[package]] @@ -3351,7 +3351,7 @@ checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes 1.6.0", "http", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] @@ -3420,10 +3420,10 @@ dependencies = [ "http-body 0.4.6", "httparse", "httpdate 1.0.3", - "itoa 1.0.10", - "pin-project-lite 0.2.13", + "itoa 1.0.11", + "pin-project-lite 0.2.14", "socket2 0.5.6", - "tokio 1.36.0", + "tokio 1.37.0", "tower-service", "tracing", "want", @@ -3497,7 +3497,7 @@ dependencies = [ "bytes 1.6.0", "hyper 0.14.28", "native-tls", - "tokio 1.36.0", + "tokio 1.37.0", "tokio-native-tls", ] @@ -3553,7 +3553,7 @@ dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", "strsim 0.10.0", - "syn 2.0.55", + "syn 2.0.57", "unic-langid", ] @@ -3567,7 +3567,7 @@ dependencies = [ "i18n-config", "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -3645,7 +3645,7 @@ dependencies = [ "futures 0.3.30", "iced_core", "log", - "tokio 1.36.0", + "tokio 1.37.0", "wasm-bindgen-futures", "wasm-timer", ] @@ -3843,7 +3843,7 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "hashbrown 0.12.3", ] @@ -4014,9 +4014,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -4224,9 +4224,9 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.1" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ "bitflags 2.5.0", "libc", @@ -4235,13 +4235,12 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.5.0", "libc", - "redox_syscall 0.4.1", ] [[package]] @@ -4318,7 +4317,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "scopeguard", ] @@ -4454,9 +4453,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap" @@ -4539,7 +4538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", - "autocfg 1.1.0", + "autocfg 1.2.0", ] [[package]] @@ -4715,8 +4714,8 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework 2.9.2", - "security-framework-sys 2.9.1", + "security-framework 2.10.0", + "security-framework-sys 2.10.0", "tempfile", ] @@ -4829,7 +4828,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "num-integer", "num-traits 0.2.18", ] @@ -4840,7 +4839,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "num-traits 0.2.18", ] @@ -4851,7 +4850,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ "arrayvec 0.7.4", - "itoa 1.0.10", + "itoa 1.0.11", ] [[package]] @@ -4869,7 +4868,7 @@ version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "num-integer", "num-traits 0.2.18", ] @@ -4880,7 +4879,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "num-bigint", "num-integer", "num-traits 0.2.18", @@ -4892,7 +4891,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "num-integer", "num-traits 0.2.18", ] @@ -4912,7 +4911,7 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "libm", ] @@ -4944,7 +4943,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -5083,7 +5082,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -5094,9 +5093,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.101" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -5144,7 +5143,7 @@ dependencies = [ "proc-macro2 1.0.79", "proc-macro2-diagnostics", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -5176,7 +5175,7 @@ checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -5414,7 +5413,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -5452,7 +5451,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -5463,9 +5462,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -5580,13 +5579,13 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "bitflags 1.3.2", "cfg-if 1.0.0", "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "windows-sys 0.48.0", ] @@ -5599,7 +5598,7 @@ dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "hermit-abi 0.3.9", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "rustix 0.38.32", "tracing", "windows-sys 0.52.0", @@ -5701,7 +5700,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", "version_check", "yansi", ] @@ -6062,12 +6061,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom 0.2.12", - "libredox 0.0.1", + "libredox 0.1.3", "thiserror", ] @@ -6096,9 +6095,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "renderdoc-sys" @@ -6130,7 +6129,7 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "rustls 0.18.1", "serde", "serde_urlencoded", @@ -6169,14 +6168,14 @@ dependencies = [ "native-tls", "once_cell", "percent-encoding", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", "system-configuration", - "tokio 1.36.0", + "tokio 1.37.0", "tokio-native-tls", "tower-service", "url", @@ -6292,7 +6291,7 @@ dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", "rust-embed-utils", - "syn 2.0.55", + "syn 2.0.57", "walkdir", ] @@ -6574,15 +6573,15 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation 0.9.4", "core-foundation-sys 0.8.6", "libc", - "security-framework-sys 2.9.1", + "security-framework-sys 2.10.0", ] [[package]] @@ -6597,9 +6596,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys 0.8.6", "libc", @@ -6678,16 +6677,16 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ - "itoa 1.0.10", + "itoa 1.0.11", "ryu", "serde", ] @@ -6708,7 +6707,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.10", + "itoa 1.0.11", "ryu", "serde", ] @@ -6824,7 +6823,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", ] [[package]] @@ -7136,9 +7135,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.55" +version = "2.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" +checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", @@ -7306,7 +7305,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -7459,16 +7458,16 @@ dependencies = [ [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes 1.6.0", "libc", "mio 0.8.11", "num_cpus", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "socket2 0.5.6", "windows-sys 0.48.0", ] @@ -7501,7 +7500,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", - "tokio 1.36.0", + "tokio 1.37.0", ] [[package]] @@ -7588,8 +7587,8 @@ dependencies = [ "bytes 1.6.0", "futures-core", "futures-sink", - "pin-project-lite 0.2.13", - "tokio 1.36.0", + "pin-project-lite 0.2.14", + "tokio 1.37.0", "tracing", ] @@ -7660,7 +7659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "tracing-attributes", "tracing-core", ] @@ -7673,7 +7672,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -8020,7 +8019,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", "wasm-bindgen-shared", ] @@ -8054,7 +8053,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8848,9 +8847,9 @@ checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xxhash-rust" @@ -8920,7 +8919,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] @@ -8940,7 +8939,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.55", + "syn 2.0.57", ] [[package]] diff --git a/crates/core/src/style/table_row.rs b/crates/core/src/style/table_row.rs index b07b492..b3843c2 100644 --- a/crates/core/src/style/table_row.rs +++ b/crates/core/src/style/table_row.rs @@ -40,7 +40,7 @@ impl StyleSheet for Theme { fn appearance(&self, style: &Self::Style) -> Appearance { match style { TableRowStyle::Default => Appearance { - text_color: Some(self.palette.normal.primary), + text_color: Some(self.palette.bright.primary), background: Some(Background::Color(self.palette.normal.primary)), border_radius: 0.0, border_width: 0.0, @@ -51,6 +51,7 @@ impl StyleSheet for Theme { offset_right: 0.0, }, TableRowStyle::TableRowAlternate => Appearance { + text_color: Some(self.palette.bright.primary), background: Some(Background::Color(Color { a: 0.50, ..self.palette.normal.primary @@ -58,7 +59,7 @@ impl StyleSheet for Theme { ..Appearance::default() }, TableRowStyle::TableRowHighlife => Appearance { - text_color: Some(self.palette.normal.primary), + text_color: Some(self.palette.bright.primary), background: Some(Background::Color(Color { a: 0.30, ..self.palette.normal.primary @@ -70,7 +71,7 @@ impl StyleSheet for Theme { offset_right: 0.0, }, TableRowStyle::TableRowLowlife => Appearance { - text_color: Some(self.palette.normal.primary), + text_color: Some(self.palette.bright.primary), background: Some(Background::Color(Color::TRANSPARENT)), border_radius: 0.0, border_width: 0.0, @@ -79,7 +80,7 @@ impl StyleSheet for Theme { offset_right: 0.0, }, TableRowStyle::TableRowSelected => Appearance { - text_color: Some(self.palette.normal.primary), + text_color: Some(self.palette.bright.primary), background: Some(Background::Color(self.palette.normal.primary)), border_radius: 0.0, border_width: 0.0, diff --git a/crates/core/src/theme/button.rs b/crates/core/src/theme/button.rs index 96cbb1e..bdfe33e 100644 --- a/crates/core/src/theme/button.rs +++ b/crates/core/src/theme/button.rs @@ -51,7 +51,7 @@ impl button::StyleSheet for Theme { ..button::Appearance::default() }, ButtonStyle::NormalText => button::Appearance { - text_color: self.palette.normal.surface, + text_color: self.palette.bright.primary, border: Border { color: self.palette.normal.primary, width: 1.0, @@ -144,14 +144,14 @@ impl button::StyleSheet for Theme { })), text_color: Color { a: 0.50, - ..self.palette.normal.primary + ..self.palette.bright.primary }, ..self.active(style) }, ButtonStyle::Primary => button::Appearance { text_color: Color { a: 0.25, - ..self.palette.normal.surface + ..self.palette.bright.primary }, ..self.active(style) }, diff --git a/crates/core/src/theme/container.rs b/crates/core/src/theme/container.rs index a3c3ee6..9160109 100644 --- a/crates/core/src/theme/container.rs +++ b/crates/core/src/theme/container.rs @@ -46,6 +46,7 @@ impl container::StyleSheet for Theme { ..container::Appearance::default() }, ContainerStyle::Segmented => container::Appearance { + text_color: Some(self.palette.bright.primary), border: Border { color: self.palette.normal.primary, width: 1.0, diff --git a/crates/core/src/widget/table_row.rs b/crates/core/src/widget/table_row.rs index 55564c0..751fad2 100644 --- a/crates/core/src/widget/table_row.rs +++ b/crates/core/src/widget/table_row.rs @@ -150,9 +150,11 @@ where renderer: &Renderer, limits: &layout::Limits, ) -> layout::Node { - let limits = limits.loose().width(self.height).height(self.height); - //.padding(); - // TODO: Above? + let limits = limits + .loose() + .width(self.width) + .height(self.height) + .shrink(self.padding); let mut content = self .content diff --git a/src/gui/element/mod.rs b/src/gui/element/mod.rs index 6069014..51375e9 100644 --- a/src/gui/element/mod.rs +++ b/src/gui/element/mod.rs @@ -13,4 +13,4 @@ pub static DEFAULT_SUB_HEADER_FONT_SIZE: u16 = 18; pub static DEFAULT_PADDING: f32 = 10.0; pub static BUTTON_WIDTH: f32 = 84.0; -pub static BUTTON_HEIGHT: f32 = 16.0; +pub static BUTTON_HEIGHT: f32 = 20.0; diff --git a/src/gui/element/wallet/operation/open.rs b/src/gui/element/wallet/operation/open.rs index 2e7772f..469c8b3 100644 --- a/src/gui/element/wallet/operation/open.rs +++ b/src/gui/element/wallet/operation/open.rs @@ -229,12 +229,11 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain .align_x(alignment::Horizontal::Center); let mut submit_button = Button::new(submit_button_label_container) + .on_press(Interaction::WalletOperationOpenViewInteraction( + LocalViewInteraction::OpenWallet, + )) .style(grin_gui_core::theme::ButtonStyle::Primary); - submit_button = submit_button.on_press(Interaction::WalletOperationOpenViewInteraction( - LocalViewInteraction::OpenWallet, - )); - let submit_button: Element = submit_button.into(); let cancel_button_label_container = @@ -249,20 +248,18 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain // &mut state.cancel_button_state, cancel_button_label_container, ) - .style(grin_gui_core::theme::ButtonStyle::Primary); - - cancel_button = cancel_button.on_press(Interaction::WalletOperationOpenViewInteraction( + .on_press(Interaction::WalletOperationOpenViewInteraction( LocalViewInteraction::CancelOpenWallet, - )); + )) + .style(grin_gui_core::theme::ButtonStyle::Primary); + let cancel_button: Element = cancel_button.into(); // give our buttons a nice double bordered look to match toolbar buttons - let submit_button: Element = submit_button.into(); let submit_container = Container::new(submit_button.map(Message::Interaction)).padding(1); let submit_container = Container::new(submit_container) .style(grin_gui_core::theme::ContainerStyle::Segmented) .padding(1); - let cancel_button: Element = cancel_button.into(); let cancel_container = Container::new(cancel_button.map(Message::Interaction)).padding(1); let cancel_container = Container::new(cancel_container) .style(grin_gui_core::theme::ContainerStyle::Segmented) diff --git a/src/gui/element/wallet/setup/wallet_list.rs b/src/gui/element/wallet/setup/wallet_list.rs index ad74ab7..bd2facb 100644 --- a/src/gui/element/wallet/setup/wallet_list.rs +++ b/src/gui/element/wallet/setup/wallet_list.rs @@ -262,7 +262,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain let wallet_name = Text::new(w.display_name.clone()).size(DEFAULT_FONT_SIZE); let chain_name = Text::new(w.chain_type.shortname()).size(DEFAULT_FONT_SIZE); - let mut wallet_name_container = Container::new(wallet_name) + /*let mut wallet_name_container = Container::new(wallet_name) .style(grin_gui_core::theme::ContainerStyle::HoverableForeground); let mut wallet_chain_container = Container::new(chain_name) @@ -284,11 +284,11 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain .style(grin_gui_core::theme::ContainerStyle::HoverableBrightForeground); wallet_directory_container = wallet_directory_container .style(grin_gui_core::theme::ContainerStyle::HoverableBrightForeground); - } + }*/ let wallet_row = Row::new() // .push(checkbox) - .push( + /* .push( Column::new() .push(wallet_name_container) .width(Length::FillPortion(1)), @@ -302,7 +302,8 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain Column::new() .push(wallet_directory_container) .width(Length::FillPortion(3)), - ); + )*/ + .push(Text::new("arse").size(DEFAULT_FONT_SIZE)); let mut table_row = TableRow::new(wallet_row) .padding(iced::Padding::from(9)) @@ -329,11 +330,14 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain } } + let table_row: Element = table_row.into(); wallet_rows.push(table_row); } let wallet_column = Column::new().push(Column::with_children( - wallet_rows.into_iter().map(|row| row.into()), + wallet_rows + .into_iter() + .map(|row| row.map(Message::Interaction)), )); let load_wallet_button_container = @@ -398,8 +402,7 @@ pub fn data_container<'a>(state: &'a StateContainer, config: &Config) -> Contain let row = Row::new().push( Column::new() - // TODO: Find out why this isn't working - //.push(table_container) + .push(table_container) .push(Space::with_height(Length::Fixed(DEFAULT_PADDING))) .push(button_row), );