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

ui: txs, account paddings fixes

Browse source
This commit is contained in:
ardocrat 2024-04-22 23:32:29 +03:00
parent f22050795e
commit df4500fac6
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/views/wallets/wallet/content.rs
View file

@ -95,7 +95,7 @@ impl WalletContent {
.show_animated_inside(ui, show_balance, |ui| { .show_animated_inside(ui, show_balance, |ui| {
ui.vertical_centered(|ui| { ui.vertical_centered(|ui| {
// Draw account info. // Draw account info.
View::max_width_ui(ui, Root::SIDE_PANEL_WIDTH * 1.25, |ui| { View::max_width_ui(ui, Root::SIDE_PANEL_WIDTH * 1.3, |ui| {
self.account_ui(ui, wallet, data.unwrap(), cb); self.account_ui(ui, wallet, data.unwrap(), cb);
}); });
}); });

30
src/gui/views/wallets/wallet/txs.rs
View file

@ -61,7 +61,8 @@ impl WalletTab for WalletInfo {
}) })
.show_inside(ui, |ui| { .show_inside(ui, |ui| {
ui.vertical_centered(|ui| { ui.vertical_centered(|ui| {
self.txs_ui(ui, wallet); let data = wallet.get_data().unwrap();
self.txs_ui(ui, wallet, &data);
}); });
}); });
} }
@ -69,12 +70,11 @@ impl WalletTab for WalletInfo {
impl WalletInfo { impl WalletInfo {
/// Draw transactions content. /// Draw transactions content.
fn txs_ui(&self, ui: &mut egui::Ui, wallet: &mut Wallet) { fn txs_ui(&self, ui: &mut egui::Ui, wallet: &mut Wallet, data: &WalletData) {
let data = wallet.get_data().unwrap();
let txs_size = data.txs.len(); let txs_size = data.txs.len();
// Show transactions info. // Show transactions info.
View::max_width_ui(ui, Root::SIDE_PANEL_WIDTH * 1.25, |ui| { View::max_width_ui(ui, Root::SIDE_PANEL_WIDTH * 1.3, |ui| {
let amount_awaiting_conf = data.info.amount_awaiting_confirmation; let amount_awaiting_conf = data.info.amount_awaiting_confirmation;
let amount_awaiting_fin = data.info.amount_awaiting_finalization; let amount_awaiting_fin = data.info.amount_awaiting_finalization;
let amount_locked = data.info.amount_locked; let amount_locked = data.info.amount_locked;
@ -140,12 +140,17 @@ impl WalletInfo {
.show_rows(ui, TX_ITEM_HEIGHT, txs_size, |ui, row_range| { .show_rows(ui, TX_ITEM_HEIGHT, txs_size, |ui, row_range| {
ui.add_space(3.0); ui.add_space(3.0);
View::max_width_ui(ui, Root::SIDE_PANEL_WIDTH * 1.3, |ui| { View::max_width_ui(ui, Root::SIDE_PANEL_WIDTH * 1.3, |ui| {
let amount_awaiting_conf = data.info.amount_awaiting_confirmation;
let amount_awaiting_fin = data.info.amount_awaiting_finalization;
let amount_locked = data.info.amount_locked;
let extra_padding = amount_awaiting_conf != 0 || amount_awaiting_fin != 0 ||
amount_locked != 0;
for index in row_range { for index in row_range {
let tx = data.txs.get(index).unwrap(); let tx = data.txs.get(index).unwrap();
// Setup item rounding. // Setup item rounding.
let item_rounding = View::item_rounding(index, txs_size, false); let item_rounding = View::item_rounding(index, txs_size, false);
// Show transaction item. // Show transaction item.
tx_item_ui(ui, tx, item_rounding, &data, wallet); tx_item_ui(ui, tx, item_rounding, extra_padding, &data, wallet);
} }
}); });
}); });
@ -159,10 +164,15 @@ const TX_ITEM_HEIGHT: f32 = 76.0;
fn tx_item_ui(ui: &mut egui::Ui, fn tx_item_ui(ui: &mut egui::Ui,
tx: &WalletTransaction, tx: &WalletTransaction,
mut rounding: Rounding, mut rounding: Rounding,
extra_padding: bool,
data: &WalletData, data: &WalletData,
wallet: &mut Wallet) { wallet: &mut Wallet) {
// Setup layout size. // Setup layout size.
let mut rect = ui.available_rect_before_wrap(); let mut rect = ui.available_rect_before_wrap();
if extra_padding {
rect.min += egui::emath::vec2(6.0, 0.0);
rect.max -= egui::emath::vec2(6.0, 0.0);
}
rect.set_height(TX_ITEM_HEIGHT); rect.set_height(TX_ITEM_HEIGHT);
// Draw round background. // Draw round background.
@ -171,6 +181,10 @@ fn tx_item_ui(ui: &mut egui::Ui,
ui.vertical(|ui| { ui.vertical(|ui| {
ui.allocate_ui_with_layout(rect.size(), Layout::right_to_left(Align::Center), |ui| { ui.allocate_ui_with_layout(rect.size(), Layout::right_to_left(Align::Center), |ui| {
if extra_padding {
ui.add_space(-6.0);
}
// Draw button to show transaction info. // Draw button to show transaction info.
rounding.nw = 0.0; rounding.nw = 0.0;
rounding.sw = 0.0; rounding.sw = 0.0;
@ -217,7 +231,11 @@ fn tx_item_ui(ui: &mut egui::Ui,
let layout_size = ui.available_size(); let layout_size = ui.available_size();
ui.allocate_ui_with_layout(layout_size, Layout::left_to_right(Align::Center), |ui| { ui.allocate_ui_with_layout(layout_size, Layout::left_to_right(Align::Center), |ui| {
ui.add_space(8.0); if extra_padding {
ui.add_space(12.0);
} else {
ui.add_space(6.0);
}
ui.vertical(|ui| { ui.vertical(|ui| {
ui.add_space(3.0); ui.add_space(3.0);