From bafa83793182edd55306a16c67b1262fa51c5a4a Mon Sep 17 00:00:00 2001 From: doryan Date: Fri, 16 Aug 2024 23:26:53 +0400 Subject: [PATCH] feat(wrapper): use pure Box component instead deleted Wrapper component feat(wrapper): use pure Box component instead deleted Wrapper component --- src/view/pages/hamming_code.rs | 8 +++++--- src/view/ui.rs | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/view/pages/hamming_code.rs b/src/view/pages/hamming_code.rs index c57762a..49644e8 100644 --- a/src/view/pages/hamming_code.rs +++ b/src/view/pages/hamming_code.rs @@ -3,7 +3,7 @@ use gtk4 as gtk; use crate::{ model::builder_traits::Product, view::{ - components::{info_bar::InfoBar, input::Input, wrapper::*}, + components::{info_bar::InfoBar, input::Input}, properties::*, }, view_utils::{hamming_code_utils::start_hamming_algorithm, input_utils::clearing}, @@ -47,13 +47,15 @@ pub fn hamming_code_page(wrapper: &Box) { let crypt_mode_label = Label::builder().label("Режим: кодирование").build(); - let crypt_mode_wrapper = Wrapper::col_builder() + let crypt_mode_wrapper = Box::builder() + .orientation(Orientation::Horizontal) .set_align(Alignment::new(Align::Fill, Align::Center)) .hexpand(true) .spacing(10) .build(); - let action_components_wrapper = Wrapper::col_builder() + let action_components_wrapper = Box::builder() + .orientation(Orientation::Horizontal) .set_align(Alignment::new(Align::Fill, Align::Fill)) .set_margin(MarginData::MultipleMargin((0, 5, 0, 5))) .spacing(10) diff --git a/src/view/ui.rs b/src/view/ui.rs index 65b0f54..b23806f 100644 --- a/src/view/ui.rs +++ b/src/view/ui.rs @@ -7,7 +7,6 @@ use info_bar::InfoBar; #[allow(unused)] use crate::view::{ - components::{pages::Pages, wrapper::*, *}, pages::*, properties::*, }; @@ -17,7 +16,8 @@ use super::styles::load_css; pub fn ui(application: &adw::Application) { load_css(); - let hamming_code = Wrapper::row_builder() + let hamming_code = Box::builder() + .orientation(Orientation::Vertical) .set_align(Alignment::new(Align::Fill, Align::Fill)) .set_margin(MarginData::EqualsMargin(15)) .spacing(10) @@ -30,7 +30,8 @@ pub fn ui(application: &adw::Application) { hamming_code::hamming_code_page(&hamming_code); - let signal_reducing = Wrapper::row_builder() + let signal_reducing = Box::builder() + .orientation(Orientation::Vertical) .set_align(Alignment::new(Align::Fill, Align::Fill)) .set_margin(MarginData::EqualsMargin(15)) .spacing(10)