migrating to iced 0.13 (paddings)

GyulyVGC · Sep 21, 2024 · 5b96882 · 5b96882
1 parent c7457e5
commit 5b96882
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 42 deletions.
diff --git a/src/gui/components/footer.rs b/src/gui/components/footer.rs
@@ -6,7 +6,7 @@ use iced::widget::text::LineHeight;
 use iced::widget::tooltip::Position;
 use iced::widget::{button, Container, Row, Text, Tooltip};
 use iced::widget::{horizontal_space, Space};
-use iced::{Alignment, Font, Length};
+use iced::{Alignment, Font, Length, Padding};
 
 use crate::gui::components::button::row_open_link_tooltip;
 use crate::gui::styles::button::ButtonType;
@@ -111,7 +111,7 @@ fn get_button_sponsor<'a>(font: Font) -> Tooltip<'a, Message, StyleType> {
  .align_y(Alignment::Center)
  .line_height(LineHeight::Relative(1.0)),
  )
- .padding([2, 0, 0, 0])
+ .padding(Padding::ZERO.top(2))
  .height(30)
  .width(30)
  .on_press(Message::OpenWebPage(WebPage::Sponsor));

diff --git a/src/gui/pages/connection_details_page.rs b/src/gui/pages/connection_details_page.rs
@@ -4,7 +4,7 @@ use iced::widget::scrollable::Direction;
 use iced::widget::tooltip::Position;
 use iced::widget::{button, horizontal_space, lazy, vertical_space, Rule, Scrollable};
 use iced::widget::{Column, Container, Row, Text, Tooltip};
-use iced::{Alignment, Font, Length};
+use iced::{Alignment, Font, Length, Padding};
 
 use crate::countries::country_utils::{get_computer_tooltip, get_flag_tooltip};
 use crate::gui::components::button::button_hide;
@@ -187,7 +187,7 @@ fn col_info<'a>(
 
  let mut ret_val = Column::new()
  .spacing(10)
- .padding([20, 10, 20, 40])
+ .padding(Padding::new(20.0).right(10).left(40))
  .width(Length::FillPortion(2))
  .push(vertical_space())
  .push(
@@ -234,24 +234,27 @@ fn col_info<'a>(
  ));
 
  if is_icmp {
- ret_val =
- ret_val.push(
- Column::new()
- .push(
- Text::new(format!("{}:", messages_translation(language)))
- .class(TextType::Subtitle)
- .font(font),
+ ret_val = ret_val.push(
+ Column::new()
+ .push(
+ Text::new(format!("{}:", messages_translation(language)))
+ .class(TextType::Subtitle)
+ .font(font),
+ )
+ .push(
+ Scrollable::new(
+ Column::new()
+ .padding(Padding::ZERO.right(10).bottom(10))
+ .push(
+ Text::new(IcmpType::pretty_print_types(&val.icmp_types)).font(font),
+ ),
  )
- .push(
- Scrollable::new(Column::new().padding([0, 10, 10, 0]).push(
- Text::new(IcmpType::pretty_print_types(&val.icmp_types)).font(font),
- ))
- .direction(Direction::Both {
- vertical: ScrollbarType::properties(),
- horizontal: ScrollbarType::properties(),
- }),
- ),
- );
+ .direction(Direction::Both {
+ vertical: ScrollbarType::properties(),
+ horizontal: ScrollbarType::properties(),
+ }),
+ ),
+ );
  }
 
  ret_val = ret_val.push(vertical_space());

diff --git a/src/gui/pages/initial_page.rs b/src/gui/pages/initial_page.rs
@@ -11,7 +11,7 @@ use iced::widget::{
  Tooltip,
 };
 use iced::Length::FillPortion;
-use iced::{alignment, Alignment, Font, Length};
+use iced::{alignment, Alignment, Font, Length, Padding};
 use pcap::Device;
 
 use crate::gui::components::button::button_open_file;
@@ -120,7 +120,7 @@ fn col_ip_buttons(
  font: Font,
  language: Language,
 ) -> Column<Message, StyleType> {
- let mut buttons_row = Row::new().spacing(5).padding([0, 0, 0, 5]);
+ let mut buttons_row = Row::new().spacing(5).padding(Padding::ZERO.left(5));
  for option in IpVersion::ALL {
  let is_active = active_ip_filters.contains(&option);
  let check_symbol = if is_active { "✔" } else { "✘" };
@@ -159,7 +159,7 @@ fn col_protocol_buttons(
  font: Font,
  language: Language,
 ) -> Column<Message, StyleType> {
- let mut buttons_row = Row::new().spacing(5).padding([0, 0, 0, 5]);
+ let mut buttons_row = Row::new().spacing(5).padding(Padding::ZERO.left(5));
  for option in Protocol::ALL {
  let is_active = active_protocol_filters.contains(&option);
  let check_symbol = if is_active { "✔" } else { "✘" };
@@ -199,7 +199,7 @@ fn col_address_input(value: &str, font: Font, language: Language) -> Column<Mess
  } else {
  AddressCollection::new(value).is_none()
  };
- let input_row = Row::new().padding([0, 0, 0, 5]).push(
+ let input_row = Row::new().padding(Padding::ZERO.left(5)).push(
  TextInput::new(AddressCollection::PLACEHOLDER_STR, value)
  .padding([3, 5])
  .on_input(Message::AddressFilter)
@@ -230,7 +230,7 @@ fn col_port_input(value: &str, font: Font, language: Language) -> Column<Message
  } else {
  PortCollection::new(value).is_none()
  };
- let input_row = Row::new().padding([0, 0, 0, 5]).push(
+ let input_row = Row::new().padding(Padding::ZERO.left(5)).push(
  TextInput::new(PortCollection::PLACEHOLDER_STR, value)
  .padding([3, 5])
  .on_input(Message::PortFilter)
@@ -378,7 +378,7 @@ fn get_export_pcap_group(
  if enabled {
  let inner_col = Column::new()
  .spacing(10)
- .padding([0, 0, 0, 45])
+ .padding(Padding::ZERO.left(45))
  .push(
  Row::new()
  .align_y(Alignment::Center)

diff --git a/src/gui/pages/inspect_page.rs b/src/gui/pages/inspect_page.rs
@@ -8,7 +8,7 @@ use iced::widget::{
  button, horizontal_space, text_input, vertical_space, Rule, Space, Toggler, Tooltip,
 };
 use iced::widget::{lazy, Button, Column, Container, Row, Scrollable, Text, TextInput};
-use iced::{alignment, Alignment, Font, Length, Pixels};
+use iced::{alignment, Alignment, Font, Length, Padding, Pixels};
 
 use crate::gui::components::tab::get_pages_tabs;
 use crate::gui::components::types::my_modal::MyModal;
@@ -95,7 +95,7 @@ pub fn inspect_page<'a>(sniffer: &Sniffer) -> Container<'a, Message, StyleType>
  Container::new(col_report)
  .align_y(Alignment::Center)
  .align_x(Alignment::Center)
- .padding([10, 7, 3, 7])
+ .padding(Padding::new(7.0).top(10).bottom(3))
  .width(1042)
  .class(ContainerType::BorderedRound),
  );
@@ -433,9 +433,9 @@ fn filter_input<'a>(
 
  Container::new(content)
  .padding(if is_filter_active {
- [5, 5, 5, 10]
+ Padding::new(5.0).left(10)
  } else {
- [5, 3, 5, 3]
+ Padding::new(5.0).right(3).left(3)
  })
  .class(if is_filter_active {
  ContainerType::Badge

diff --git a/src/gui/pages/overview_page.rs b/src/gui/pages/overview_page.rs
@@ -11,7 +11,7 @@ use iced::widget::{
  Scrollable, Space, Text, Tooltip,
 };
 use iced::Length::{Fill, FillPortion};
-use iced::{Alignment, Font, Length};
+use iced::{Alignment, Font, Length, Padding};
 
 use crate::countries::country_utils::get_flag_tooltip;
 use crate::countries::flags_pictures::FLAGS_WIDTH_BIG;
@@ -247,7 +247,7 @@ fn lazy_row_report<'a>(sniffer: &Sniffer) -> Container<'a, Message, StyleType> {
  let col_service = col_service(250.0, sniffer);
 
  let row_report = Row::new()
- .padding([0, 10, 5, 10])
+ .padding(Padding::new(10.0).top(0).bottom(5))
  .push(col_host)
  .push(Rule::vertical(40))
  .push(col_service);
@@ -323,7 +323,7 @@ fn col_host(width: f32, sniffer: &Sniffer) -> Column<Message, StyleType> {
 
  scroll_host = scroll_host.push(
  button(content)
- .padding([5, 15, 5, 10])
+ .padding(Padding::new(5.0).right(15).left(10))
  .on_press(Message::Search(SearchParameters::new_host_search(host)))
  .class(ButtonType::Neutral),
  );
@@ -401,7 +401,7 @@ fn col_service(width: f32, sniffer: &Sniffer) -> Column<Message, StyleType> {
 
  scroll_service = scroll_service.push(
  button(content)
- .padding([5, 15, 8, 10])
+ .padding(Padding::new(5.0).right(15).bottom(8).left(10))
  .on_press(Message::Search(SearchParameters::new_service_search(
  service,
  )))
@@ -494,7 +494,7 @@ fn lazy_col_info<'a>(
 
  Container::new(content)
  .width(400)
- .padding([10, 5, 5, 5])
+ .padding(Padding::new(5.0).top(10))
  .align_x(Alignment::Center)
  .class(ContainerType::BorderedRound)
 }
@@ -781,7 +781,7 @@ fn get_active_filters_col(
  ret_val = ret_val.push(if show {
  Row::new().push(Text::new(filters_string).font(font))
  } else {
- Row::new().padding([0, 0, 0, 20]).push(
+ Row::new().padding(Padding::ZERO.left(20)).push(
  Tooltip::new(
  Container::new(
  Text::new("i")

diff --git a/src/gui/pages/settings_notifications_page.rs b/src/gui/pages/settings_notifications_page.rs
@@ -1,7 +1,7 @@
 use iced::widget::scrollable::Direction;
 use iced::widget::{horizontal_space, Button, Slider};
 use iced::widget::{Checkbox, Column, Container, Row, Scrollable, Space, Text, TextInput};
-use iced::{Alignment, Font, Length};
+use iced::{Alignment, Font, Length, Padding};
 
 use crate::gui::components::button::button_hide;
 use crate::gui::components::tab::get_settings_tabs;
@@ -62,7 +62,7 @@ pub fn settings_notifications_page<'a>(sniffer: &Sniffer) -> Container<'a, Messa
  .push(Space::with_height(5));
 
  let volume_notification_col = Column::new()
- .padding([0, 0, 5, 0])
+ .padding(Padding::ZERO.bottom(5))
  .align_x(Alignment::Center)
  .width(Length::Fill)
  .push(volume_slider(language, font, notifications.volume))

diff --git a/src/gui/pages/settings_style_page.rs b/src/gui/pages/settings_style_page.rs
@@ -1,7 +1,7 @@
 use iced::widget::scrollable::Direction;
 use iced::widget::{button, lazy, Rule, Space};
 use iced::widget::{Button, Column, Container, Row, Scrollable, Text};
-use iced::{Alignment, Color, Element, Font, Length};
+use iced::{Alignment, Color, Element, Font, Length, Padding};
 
 use crate::gui::components::button::button_open_file;
 use crate::gui::components::tab::get_settings_tabs;
@@ -41,7 +41,7 @@ pub fn settings_style_page<'a>(sniffer: &Sniffer) -> Container<'a, Message, Styl
  let font_headers = style.get_extension().font_headers;
 
  let mut content = Column::new()
- .padding([0, 0, 5, 0])
+ .padding(Padding::ZERO.bottom(5))
  .align_x(Alignment::Center)
  .width(Length::Fill)
  .push(settings_header(
@@ -351,7 +351,7 @@ fn lazy_custom_style_input(
  75
  })
  .width(380)
- .padding([10, 0, 5, 0])
+ .padding(Padding::ZERO.top(10).bottom(5))
  .class(if is_custom_toml_style_set {
  ButtonType::BorderedRoundSelected
  } else {