From b56a9528c11ddca00dd8549a21986b453a353577 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sat, 29 Aug 2026 10:03:48 +0100 Subject: task-001: adds spacing around edges of screen --- schist_desktop_gui/src/gui.rs | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/schist_desktop_gui/src/gui.rs b/schist_desktop_gui/src/gui.rs index 78fea11..09ee9da 100644 --- a/schist_desktop_gui/src/gui.rs +++ b/schist_desktop_gui/src/gui.rs @@ -6,7 +6,7 @@ pub mod screens; use std::{path::PathBuf, str::FromStr}; use diesel::SqliteConnection; -use iced::{Element, Task}; +use iced::{Element, Task, widget::Container}; use schist_models::{Account, AccountTransfer, Bucket, Transaction}; use schist_queries::{ account_transfers::get_all_account_transfers, accounts::get_all_accounts, @@ -14,14 +14,7 @@ use schist_queries::{ }; use crate::{ - cache::{put_to_cache, remove_from_cache, CACHE_KEYS}, - config::Config, - dialog::{import_from_actualbudget_dialog, new_file_dialog, pick_file_dialog}, - gui::screens::{files_screen, main_screen, FilesScreen, MainScreen, Screen}, - paths::{get_file_paths, get_schist_database_directory}, - shortcut::KeyBind, - traits::{Component, Viewable}, - Cache, DatabaseConnection, + Cache, DatabaseConnection, cache::{CACHE_KEYS, put_to_cache, remove_from_cache}, config::Config, dialog::{import_from_actualbudget_dialog, new_file_dialog, pick_file_dialog}, gui::screens::{FilesScreen, MainScreen, Screen, files_screen, main_screen}, paths::{get_file_paths, get_schist_database_directory}, shortcut::KeyBind, style::SPACING_MD, traits::{Component, Viewable}, }; #[derive(Clone, Debug)] @@ -86,10 +79,10 @@ impl Gui { impl Gui { pub fn view<'a>(&'a self) -> Element<'a, Message> { - match self.active_screen { + Container::new(match self.active_screen { Screen::FilesScreen => self.files_screen.view().map(Message::FilesScreenMessage), Screen::MainScreen => self.main_screen.view().map(Message::MainScreenMessage), - } + }).padding(SPACING_MD).into() } pub fn update(&mut self, message: Message) -> iced::Task { -- cgit v1.2.3