From 39493d5cedd4b163c40eefa5c7feddadfb9b2f84 Mon Sep 17 00:00:00 2001 From: yggverse Date: Fri, 7 Feb 2025 16:16:52 +0200 Subject: [PATCH] update margins --- .../window/tab/item/page/input/titan/file.rs | 1 - .../tab/item/page/input/titan/file/form.rs | 5 +--- .../window/tab/item/page/input/titan/text.rs | 6 ++--- .../tab/item/page/input/titan/text/form.rs | 27 ++++++++++--------- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/app/browser/window/tab/item/page/input/titan/file.rs b/src/app/browser/window/tab/item/page/input/titan/file.rs index 908db675..d83e7773 100644 --- a/src/app/browser/window/tab/item/page/input/titan/file.rs +++ b/src/app/browser/window/tab/item/page/input/titan/file.rs @@ -34,7 +34,6 @@ impl File for Box { const MARGIN: i32 = 8; let g_box = Box::builder() - .margin_bottom(MARGIN) .margin_end(MARGIN) .margin_start(MARGIN) .orientation(Orientation::Vertical) diff --git a/src/app/browser/window/tab/item/page/input/titan/file/form.rs b/src/app/browser/window/tab/item/page/input/titan/file/form.rs index 40a11fed..f146e332 100644 --- a/src/app/browser/window/tab/item/page/input/titan/file/form.rs +++ b/src/app/browser/window/tab/item/page/input/titan/file/form.rs @@ -8,12 +8,9 @@ impl Form for Button { fn form() -> Self { use gtk::prelude::{ButtonExt, WidgetExt}; - const MARGIN: i32 = 8; - let button = Button::builder() .label("Choose a file..") - .margin_bottom(MARGIN) - .margin_top(MARGIN) + .margin_top(4) .build(); button.connect_clicked(|this| { diff --git a/src/app/browser/window/tab/item/page/input/titan/text.rs b/src/app/browser/window/tab/item/page/input/titan/text.rs index f387fac4..54fb3d71 100644 --- a/src/app/browser/window/tab/item/page/input/titan/text.rs +++ b/src/app/browser/window/tab/item/page/input/titan/text.rs @@ -29,14 +29,12 @@ impl Text for gtk::Box { // Init widget let g_box = { const MARGIN: i32 = 8; - const SPACING: i32 = 8; - let g_box = gtk::Box::builder() - .margin_bottom(MARGIN) + .margin_bottom(MARGIN / 2) .margin_end(MARGIN) .margin_start(MARGIN) .orientation(Orientation::Vertical) - .spacing(SPACING) + .spacing(MARGIN) .build(); g_box.append(&form); diff --git a/src/app/browser/window/tab/item/page/input/titan/text/form.rs b/src/app/browser/window/tab/item/page/input/titan/text/form.rs index 479049d6..93f9bcde 100644 --- a/src/app/browser/window/tab/item/page/input/titan/text/form.rs +++ b/src/app/browser/window/tab/item/page/input/titan/text/form.rs @@ -6,8 +6,6 @@ use gtk::{ use libspelling::{Checker, TextBufferAdapter}; use sourceview::Buffer; -const MARGIN: i32 = 8; - pub trait Form { fn form() -> Self; fn text(&self) -> GString; @@ -27,17 +25,20 @@ impl Form for TextView { adapter.set_enabled(true); // Init main widget - let text_view = TextView::builder() - .bottom_margin(MARGIN) - .buffer(&buffer) - .css_classes(["frame", "view"]) - .extra_menu(&adapter.menu_model()) - .left_margin(MARGIN) - .margin_bottom(MARGIN / 2) - .right_margin(MARGIN) - .top_margin(MARGIN) - .wrap_mode(WrapMode::Word) - .build(); + + let text_view = { + const MARGIN: i32 = 8; + TextView::builder() + .bottom_margin(MARGIN) + .buffer(&buffer) + .css_classes(["frame", "view"]) + .extra_menu(&adapter.menu_model()) + .left_margin(MARGIN) + .right_margin(MARGIN) + .top_margin(MARGIN) + .wrap_mode(WrapMode::Word) + .build() + }; text_view.insert_action_group("spelling", Some(&adapter)); text_view.set_size_request(-1, 38); // @TODO [#635](https://gitlab.gnome.org/GNOME/pygobject/-/issues/635)