diff --git a/src/components/base/settingBox.rs b/src/components/base/settingBox.rs index bffe624..30b309c 100644 --- a/src/components/base/settingBox.rs +++ b/src/components/base/settingBox.rs @@ -1,21 +1,19 @@ use crate::components::base::settingBoxImpl; use adw::glib; use adw::glib::{IsA, Object}; -use glib::subclass::prelude::ObjectSubclassIsExt; -use gtk::prelude::FrameExt; +use gtk::prelude::BoxExt; use gtk::Widget; glib::wrapper! { pub struct SettingBox(ObjectSubclass) - @extends gtk::Frame, gtk::Widget, + @extends gtk::Box, gtk::Widget, @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget; } impl SettingBox { - pub fn new(child: &impl IsA, title: &str) -> Self { + pub fn new(child: &impl IsA) -> Self { let entry: SettingBox = Object::builder().build(); - entry.set_child(Some(child)); - entry.imp().resetSettingLabel.set_text(title); + entry.append(child); entry } } \ No newline at end of file diff --git a/src/components/base/settingBoxImpl.rs b/src/components/base/settingBoxImpl.rs index e895ab5..b0009f1 100644 --- a/src/components/base/settingBoxImpl.rs +++ b/src/components/base/settingBoxImpl.rs @@ -5,16 +5,13 @@ use crate::components::base::settingBox; #[allow(non_snake_case)] #[derive(Default, CompositeTemplate)] #[template(resource = "/org/Xetibo/ReSet/resetSettingBox.ui")] -pub struct SettingBox { - #[template_child] - pub resetSettingLabel: TemplateChild