From 78c2765d2ab23fdd102e87750ec53e0a2b8c542b Mon Sep 17 00:00:00 2001 From: yggverse Date: Wed, 16 Oct 2024 12:40:38 +0300 Subject: [PATCH] use adw Clamp for input --- src/app/browser/window/tab/item/page/input.rs | 4 ++-- .../tab/item/page/input/content/send/widget.rs | 2 +- .../browser/window/tab/item/page/input/widget.rs | 14 ++++++++------ src/app/browser/window/tab/item/page/widget.rs | 6 +++--- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/app/browser/window/tab/item/page/input.rs b/src/app/browser/window/tab/item/page/input.rs index 9a200bce..d8cdac96 100644 --- a/src/app/browser/window/tab/item/page/input.rs +++ b/src/app/browser/window/tab/item/page/input.rs @@ -4,7 +4,7 @@ mod widget; use content::Content; use widget::Widget; -use adw::ToolbarView; +use adw::Clamp; use std::sync::Arc; pub struct Input { @@ -32,7 +32,7 @@ impl Input { } // Getters - pub fn gobject(&self) -> &ToolbarView { + pub fn gobject(&self) -> &Clamp { &self.widget.gobject() } } diff --git a/src/app/browser/window/tab/item/page/input/content/send/widget.rs b/src/app/browser/window/tab/item/page/input/content/send/widget.rs index adaba797..31bd9f41 100644 --- a/src/app/browser/window/tab/item/page/input/content/send/widget.rs +++ b/src/app/browser/window/tab/item/page/input/content/send/widget.rs @@ -9,7 +9,7 @@ impl Widget { // Construct pub fn new_arc() -> Arc { let gobject = Button::builder() - .css_classes(["accent"]) + //.css_classes(["accent"]) .halign(Align::End) .label("Send") .build(); diff --git a/src/app/browser/window/tab/item/page/input/widget.rs b/src/app/browser/window/tab/item/page/input/widget.rs index c7b9a331..0da008ef 100644 --- a/src/app/browser/window/tab/item/page/input/widget.rs +++ b/src/app/browser/window/tab/item/page/input/widget.rs @@ -1,16 +1,18 @@ -use adw::ToolbarView; +use adw::Clamp; use gtk::{prelude::WidgetExt, Box}; use std::sync::Arc; pub struct Widget { - gobject: ToolbarView, + gobject: Clamp, } impl Widget { // Construct - pub fn new_arc(content: &Box) -> Arc { - let gobject = ToolbarView::builder() - .content(content) + pub fn new_arc(child: &Box) -> Arc { + let gobject = Clamp::builder() + .child(child) + .css_classes(["app-notification"]) + .maximum_size(800) .visible(false) .build(); @@ -23,7 +25,7 @@ impl Widget { } // Getters - pub fn gobject(&self) -> &ToolbarView { + pub fn gobject(&self) -> &Clamp { &self.gobject } } diff --git a/src/app/browser/window/tab/item/page/widget.rs b/src/app/browser/window/tab/item/page/widget.rs index c67bff78..a0f17743 100644 --- a/src/app/browser/window/tab/item/page/widget.rs +++ b/src/app/browser/window/tab/item/page/widget.rs @@ -1,4 +1,4 @@ -use adw::ToolbarView; +use adw::Clamp; use gtk::{ gio::{SimpleAction, SimpleActionGroup}, glib::uuid_string_random, @@ -20,7 +20,7 @@ impl Widget { // Components navigation: &Box, content: &Box, - input: &ToolbarView, + input: &Clamp, ) -> Arc { // Init additional action group let action_group = SimpleActionGroup::new(); @@ -33,8 +33,8 @@ impl Widget { .build(); gobject.append(navigation); - gobject.append(input); gobject.append(content); + gobject.append(input); gobject.insert_action_group(&uuid_string_random(), Some(&action_group));