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

ui: optimize wallet creation bottom panel

Browse source
This commit is contained in:
ardocrat 2024-04-17 03:51:01 +03:00
parent 8d680f3750
commit fa71dc2ada
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/views/wallets/content.rs
View file

@ -188,7 +188,8 @@ impl WalletsContent {
ui.style_mut().spacing.button_padding = egui::vec2(10.0, 4.0); ui.style_mut().spacing.button_padding = egui::vec2(10.0, 4.0);
ui.vertical_centered(|ui| { ui.vertical_centered(|ui| {
View::tab_button(ui, PLUS, false, || { let pressed = Modal::opened() == Some(WalletCreation::NAME_PASS_MODAL);
View::tab_button(ui, PLUS, pressed, || {
self.creation_content.show_name_pass_modal(cb); self.creation_content.show_name_pass_modal(cb);
}); });
}); });

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

@ -73,12 +73,12 @@ impl WalletCreation {
egui::TopBottomPanel::bottom("wallet_creation_step_panel") egui::TopBottomPanel::bottom("wallet_creation_step_panel")
.frame(egui::Frame { .frame(egui::Frame {
stroke: View::DEFAULT_STROKE, stroke: View::DEFAULT_STROKE,
fill: Colors::FILL_DARK, fill: Colors::FILL,
inner_margin: Margin { inner_margin: Margin {
left: View::far_left_inset_margin(ui) + 6.0, left: View::far_left_inset_margin(ui) + 4.0,
right: View::get_right_inset() + 6.0, right: View::get_right_inset() + 4.0,
top: 4.0, top: 4.0,
bottom: View::get_bottom_inset() + 4.0, bottom: View::get_bottom_inset(),
}, },
..Default::default() ..Default::default()
}) })
@ -164,8 +164,9 @@ impl WalletCreation {
Step::SetupConnection => (t!("wallets.setup_conn_desc"), true) Step::SetupConnection => (t!("wallets.setup_conn_desc"), true)
}; };
// Show step description. // Show step description.
ui.add_space(2.0);
ui.label(RichText::new(step_text).size(16.0).color(Colors::GRAY)); ui.label(RichText::new(step_text).size(16.0).color(Colors::GRAY));
ui.add_space(2.0);
// Show error if entered phrase is not valid. // Show error if entered phrase is not valid.
if !self.mnemonic_setup.valid_phrase { if !self.mnemonic_setup.valid_phrase {
step_available = false; step_available = false;
@ -178,9 +179,10 @@ impl WalletCreation {
ui.add_space(4.0); ui.add_space(4.0);
if !step_available { if !step_available {
self.copy_or_paste_button_ui(ui, cb); self.copy_or_paste_button_ui(ui, cb);
ui.add_space(4.0);
} else { } else {
// Setup spacing between buttons. // Setup spacing between buttons.
ui.spacing_mut().item_spacing = egui::Vec2::new(8.0, 0.0); ui.spacing_mut().item_spacing = egui::Vec2::new(6.0, 0.0);
ui.columns(2, |columns| { ui.columns(2, |columns| {
// Show copy or paste button for mnemonic phrase step. // Show copy or paste button for mnemonic phrase step.
@ -200,6 +202,7 @@ impl WalletCreation {
if step_available { if step_available {
ui.add_space(4.0); ui.add_space(4.0);
self.next_step_button_ui(ui, step, on_create); self.next_step_button_ui(ui, step, on_create);
ui.add_space(4.0);
} }
} }
ui.add_space(4.0); ui.add_space(4.0);