From d34b8fe43a826fc9f7de49695bb45ab803ac2e36 Mon Sep 17 00:00:00 2001 From: yggverse Date: Tue, 4 Feb 2025 00:01:18 +0200 Subject: [PATCH] wrap some locals in scope --- .../window/tab/item/page/content/text.rs | 23 ++++++++-------- .../tab/item/page/content/text/gemini.rs | 26 ++++++++++--------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/app/browser/window/tab/item/page/content/text.rs b/src/app/browser/window/tab/item/page/content/text.rs index 65902ee7..87f9e82c 100644 --- a/src/app/browser/window/tab/item/page/content/text.rs +++ b/src/app/browser/window/tab/item/page/content/text.rs @@ -24,9 +24,6 @@ impl Text { base: &Uri, gemtext: &str, ) -> Self { - // Define some local dependencies - use gtk::{prelude::WidgetExt, GestureClick}; - // Init gemtext reader let gemini = Gemini::build(actions, base, gemtext).unwrap(); // @TODO handle @@ -38,16 +35,18 @@ impl Text { .build(); // Grab focus into the `TextView` on click empty `ClampScrollable` area - let controller = GestureClick::new(); + { + use gtk::{prelude::WidgetExt, GestureClick}; + let controller = GestureClick::new(); - controller.connect_released({ - let text_view = gemini.text_view.clone(); - move |_, _, _, _| { - text_view.grab_focus(); - } - }); - - clamp_scrollable.add_controller(controller); + controller.connect_released({ + let text_view = gemini.text_view.clone(); + move |_, _, _, _| { + text_view.grab_focus(); + } + }); + clamp_scrollable.add_controller(controller); + } Self { text_view: gemini.text_view, diff --git a/src/app/browser/window/tab/item/page/content/text/gemini.rs b/src/app/browser/window/tab/item/page/content/text/gemini.rs index 50d58547..51d5abc8 100644 --- a/src/app/browser/window/tab/item/page/content/text/gemini.rs +++ b/src/app/browser/window/tab/item/page/content/text/gemini.rs @@ -83,18 +83,20 @@ impl Gemini { let buffer = TextBuffer::new(Some(&tag.text_tag_table)); // Init main widget - const MARGIN: i32 = 8; - let text_view = TextView::builder() - .bottom_margin(MARGIN) - .buffer(&buffer) - .cursor_visible(false) - .editable(false) - .left_margin(MARGIN) - .right_margin(MARGIN) - .top_margin(MARGIN) - .vexpand(true) - .wrap_mode(WrapMode::Word) - .build(); + let text_view = { + const MARGIN: i32 = 8; + TextView::builder() + .bottom_margin(MARGIN) + .buffer(&buffer) + .cursor_visible(false) + .editable(false) + .left_margin(MARGIN) + .right_margin(MARGIN) + .top_margin(MARGIN) + .vexpand(true) + .wrap_mode(WrapMode::Word) + .build() + }; // Parse gemtext lines for line in gemtext.lines() {