diff --git a/src/gui/views/network/content.rs b/src/gui/views/network/content.rs index 54dd3ca..9e7f2aa 100644 --- a/src/gui/views/network/content.rs +++ b/src/gui/views/network/content.rs @@ -79,12 +79,6 @@ impl NetworkContent { .resizable(false) .exact_width(ui.available_width()) .frame(egui::Frame { - outer_margin: Margin { - left: -0.5, - right: -0.5, - top: 0.0, - bottom: 0.0, - }, ..Default::default() }) .show_animated_inside(ui, !show_connections, |ui| { @@ -108,16 +102,6 @@ impl NetworkContent { // Show connections content. egui::CentralPanel::default() .frame(egui::Frame { - outer_margin: if show_connections { - Margin { - left: -0.5, - right: -0.5, - top: 0.0, - bottom: -0.5, - } - } else { - Margin::ZERO - }, ..Default::default() }) .show_inside(ui, |ui| { @@ -142,7 +126,7 @@ impl NetworkContent { 4.0 }, }, - fill: Colors::fill(), + fill: Colors::button(), ..Default::default() }) .show_inside(ui, |ui| { diff --git a/src/gui/views/root.rs b/src/gui/views/root.rs index 0e7701a..cc1261e 100644 --- a/src/gui/views/root.rs +++ b/src/gui/views/root.rs @@ -14,7 +14,7 @@ use std::sync::atomic::{AtomicBool, Ordering}; use egui::os::OperatingSystem; -use egui::{Align, Layout, RichText}; +use egui::{Align, Layout, Margin, RichText}; use lazy_static::lazy_static; use crate::gui::Colors; @@ -115,6 +115,16 @@ impl Root { .resizable(false) .exact_width(panel_width) .frame(egui::Frame { + outer_margin: Margin { + left: 0.0, + right: if dual_panel { + -0.5 + } else { + 0.0 + }, + top: 0.0, + bottom: 0.0, + }, ..Default::default() }) .show_animated_inside(ui, is_panel_open, |ui| { diff --git a/src/gui/views/wallets/content.rs b/src/gui/views/wallets/content.rs index eb7ae97..f854aeb 100644 --- a/src/gui/views/wallets/content.rs +++ b/src/gui/views/wallets/content.rs @@ -214,16 +214,6 @@ impl WalletsContent { top: 3.0, bottom: 4.0, }, - outer_margin: Margin { - left: 0.0, - right: if !wallet_panel_opened { - -0.5 - } else { - 0.0 - }, - top: 0.0, - bottom: 0.0, - }, ..Default::default() } }) diff --git a/src/gui/views/wallets/wallet/content.rs b/src/gui/views/wallets/wallet/content.rs index 6a90ec6..d7d29c8 100644 --- a/src/gui/views/wallets/wallet/content.rs +++ b/src/gui/views/wallets/wallet/content.rs @@ -103,8 +103,12 @@ impl WalletContent { bottom: 0.0, }, outer_margin: Margin { - left: -0.5, - right: -0.5, + left: if dual_panel { + -0.5 + } else { + 0.0 + }, + right: 0.0, top: 0.0, bottom: if dual_panel { -1.0 @@ -152,8 +156,12 @@ impl WalletContent { egui::CentralPanel::default() .frame(egui::Frame { outer_margin: Margin { - left: -0.5, - right: -0.5, + left: if dual_panel { + -0.5 + } else { + 0.0 + }, + right: 0.0, top: 0.0, bottom: 0.0, },