mirror of
https://github.com/project-gauntlet/gauntlet.git
synced 2025-12-23 10:35:53 +00:00
Continue Settings UI style tweaks
This commit is contained in:
Exidex
parent
c840eb707d
commit
d15952f795
7 changed files with 157 additions and 112 deletions
|
|
@ -378,7 +378,7 @@ impl GauntletTheme {
|
|||
background_color_hovered: PRIMARY_HOVERED,
|
||||
text_color: TEXT_DARK,
|
||||
text_color_hovered: TEXT_DARK,
|
||||
border_radius: 4.0,
|
||||
border_radius: BUTTON_BORDER_RADIUS,
|
||||
border_width: 1.0,
|
||||
border_color: BACKGROUND_LIGHT,
|
||||
},
|
||||
|
|
@ -387,7 +387,7 @@ impl GauntletTheme {
|
|||
background_color_selected: BACKGROUND_LIGHT,
|
||||
text_color: TEXT,
|
||||
text_color_selected: TEXT,
|
||||
border_radius: 4.0,
|
||||
border_radius: BUTTON_BORDER_RADIUS,
|
||||
border_width: 1.0,
|
||||
border_color: BACKGROUND_LIGHT,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
use iced::Border;
|
||||
use iced::widget::checkbox;
|
||||
use iced::widget::checkbox::Appearance;
|
||||
use crate::theme::{BACKGROUND, BACKGROUND_LIGHT, GauntletSettingsTheme, PRIMARY, PRIMARY_HOVERED};
|
||||
|
||||
use crate::theme::{BACKGROUND, BACKGROUND_LIGHT, BACKGROUND_LIGHTER, BACKGROUND_LIGHTEST, GauntletSettingsTheme, PRIMARY, PRIMARY_HOVERED};
|
||||
|
||||
#[derive(Default)]
|
||||
pub enum CheckboxStyle {
|
||||
|
|
@ -49,4 +50,19 @@ impl checkbox::StyleSheet for GauntletSettingsTheme {
|
|||
text_color: None,
|
||||
}
|
||||
}
|
||||
|
||||
fn disabled(&self, _: &Self::Style, is_checked: bool) -> Appearance {
|
||||
let background = if is_checked {
|
||||
BACKGROUND_LIGHTER.to_iced().into()
|
||||
} else {
|
||||
BACKGROUND_LIGHT.to_iced().into()
|
||||
};
|
||||
|
||||
Appearance {
|
||||
background,
|
||||
icon_color: BACKGROUND.to_iced(),
|
||||
border: Default::default(),
|
||||
text_color: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +1,14 @@
|
|||
use iced::Border;
|
||||
use iced::widget::container;
|
||||
|
||||
use crate::theme::{BACKGROUND_OVERLAY, GauntletSettingsTheme};
|
||||
use crate::theme::{BACKGROUND_LIGHT, BACKGROUND_OVERLAY, GauntletSettingsTheme};
|
||||
|
||||
#[derive(Default)]
|
||||
pub enum ContainerStyle {
|
||||
#[default]
|
||||
Transparent,
|
||||
Box
|
||||
Box,
|
||||
TextInputLike
|
||||
}
|
||||
|
||||
impl container::StyleSheet for GauntletSettingsTheme {
|
||||
|
|
@ -18,7 +19,6 @@ impl container::StyleSheet for GauntletSettingsTheme {
|
|||
ContainerStyle::Transparent => Default::default(),
|
||||
ContainerStyle::Box => {
|
||||
container::Appearance {
|
||||
text_color: None,
|
||||
background: Some(BACKGROUND_OVERLAY.to_iced().into()), // TODO
|
||||
border: Border {
|
||||
color: BACKGROUND_OVERLAY.to_iced(),
|
||||
|
|
@ -28,6 +28,17 @@ impl container::StyleSheet for GauntletSettingsTheme {
|
|||
..Default::default()
|
||||
}
|
||||
}
|
||||
ContainerStyle::TextInputLike => {
|
||||
container::Appearance {
|
||||
background: Some(BACKGROUND_LIGHT.to_iced().into()),
|
||||
border: Border {
|
||||
radius: 4.0.into(),
|
||||
width: 1.0,
|
||||
color: BACKGROUND_LIGHT.to_iced().into(),
|
||||
},
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
use iced::{Border, overlay};
|
||||
use iced::widget::pick_list;
|
||||
|
||||
use crate::theme::{BACKGROUND, BACKGROUND_LIGHT, GauntletSettingsTheme, NOT_INTENDED_TO_BE_USED, PRIMARY, PRIMARY_HOVERED, TEXT, TEXT_DARK};
|
||||
use crate::theme::{BACKGROUND, BACKGROUND_LIGHT, BUTTON_BORDER_RADIUS, GauntletSettingsTheme, NOT_INTENDED_TO_BE_USED, PRIMARY, PRIMARY_HOVERED, TEXT, TEXT_DARK};
|
||||
|
||||
#[derive(Clone, Default)]
|
||||
pub enum PickListStyle {
|
||||
|
|
@ -46,12 +46,12 @@ fn pick_list_appearance(state: PickListState) -> pick_list::Appearance {
|
|||
pick_list::Appearance {
|
||||
text_color,
|
||||
background: background_color.into(),
|
||||
placeholder_color: NOT_INTENDED_TO_BE_USED.to_iced(),
|
||||
placeholder_color: BACKGROUND_LIGHT.to_iced(),
|
||||
handle_color: text_color,
|
||||
border: Border {
|
||||
color: BACKGROUND_LIGHT.to_iced(),
|
||||
width: 4.0,
|
||||
radius: 1.0.into(),
|
||||
width: 1.0,
|
||||
radius: BUTTON_BORDER_RADIUS.into(),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
@ -64,7 +64,7 @@ impl overlay::menu::StyleSheet for GauntletSettingsTheme {
|
|||
text_color: TEXT.to_iced(),
|
||||
background: BACKGROUND.to_iced().into(),
|
||||
border: Border {
|
||||
radius: 4.0.into(),
|
||||
radius: BUTTON_BORDER_RADIUS.into(),
|
||||
width: 1.0,
|
||||
color: BACKGROUND_LIGHT.to_iced().into(),
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,19 +1,29 @@
|
|||
use iced::widget::text;
|
||||
|
||||
use crate::theme::GauntletSettingsTheme;
|
||||
use crate::theme::{GauntletSettingsTheme, TEXT_DARKER};
|
||||
|
||||
#[derive(Default, Clone)]
|
||||
pub enum TextStyle {
|
||||
#[default]
|
||||
Default
|
||||
Default,
|
||||
Subtitle
|
||||
}
|
||||
|
||||
impl text::StyleSheet for GauntletSettingsTheme {
|
||||
type Style = TextStyle;
|
||||
|
||||
fn appearance(&self, _: Self::Style) -> text::Appearance {
|
||||
text::Appearance {
|
||||
color: None,
|
||||
fn appearance(&self, style: Self::Style) -> text::Appearance {
|
||||
match style {
|
||||
TextStyle::Default => {
|
||||
text::Appearance {
|
||||
color: None,
|
||||
}
|
||||
}
|
||||
TextStyle::Subtitle => {
|
||||
text::Appearance {
|
||||
color: Some(TEXT_DARKER.to_iced()),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,11 +47,11 @@ impl text_input::StyleSheet for GauntletSettingsTheme {
|
|||
|
||||
fn disabled(&self, _: &Self::Style) -> Appearance {
|
||||
Appearance {
|
||||
background: NOT_INTENDED_TO_BE_USED.to_iced().into(),
|
||||
background: BACKGROUND_LIGHT.to_iced().into(),
|
||||
border: Border {
|
||||
radius: 2.0.into(),
|
||||
radius: 4.0.into(),
|
||||
width: 1.0,
|
||||
color: Color::TRANSPARENT,
|
||||
color: BACKGROUND_LIGHT.to_iced().into(),
|
||||
},
|
||||
icon_color: NOT_INTENDED_TO_BE_USED.to_iced(),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ use common::rpc::backend_api::BackendApi;
|
|||
use crate::theme::{Element, GauntletSettingsTheme};
|
||||
use crate::theme::button::ButtonStyle;
|
||||
use crate::theme::container::ContainerStyle;
|
||||
use crate::theme::text::TextStyle;
|
||||
|
||||
const SETTINGS_ENV: &'static str = "GAUNTLET_INTERNAL_SETTINGS";
|
||||
|
||||
|
|
@ -432,7 +433,7 @@ impl Application for ManagementAppModel {
|
|||
.into();
|
||||
|
||||
let table: Element<_> = container(table)
|
||||
.padding(Padding::new(5.0))
|
||||
.padding(Padding::new(8.0))
|
||||
.into();
|
||||
|
||||
let sidebar_content: Element<_> = match &self.selected_item {
|
||||
|
|
@ -441,10 +442,12 @@ impl Application for ManagementAppModel {
|
|||
let text2: Element<_> = text("or").into();
|
||||
let text3: Element<_> = text("Click '+' to add new plugin").into();
|
||||
|
||||
let text_column = column(vec![text1, text2, text3]).align_items(Alignment::Center);
|
||||
let text_column = column(vec![text1, text2, text3])
|
||||
.align_items(Alignment::Center);
|
||||
|
||||
container(text_column)
|
||||
.center_y()
|
||||
.center_x()
|
||||
.height(Length::Fill)
|
||||
.width(Length::Fill)
|
||||
.into()
|
||||
|
|
@ -454,30 +457,31 @@ impl Application for ManagementAppModel {
|
|||
let plugin = plugin_data.plugins.get(&plugin_id).unwrap();
|
||||
|
||||
let name = container(text(&plugin.plugin_name))
|
||||
.padding(Padding::new(10.0))
|
||||
.into();
|
||||
|
||||
let description_label: Element<_> = text("Description")
|
||||
.font(Font {
|
||||
weight: Weight::Bold,
|
||||
..Font::DEFAULT
|
||||
})
|
||||
.into();
|
||||
|
||||
let description_label = container(description_label)
|
||||
.padding(Padding::from([0.0, 0.0, 0.0, 10.0]))
|
||||
.into();
|
||||
|
||||
let description = container(text(&plugin.plugin_description))
|
||||
.padding(Padding::new(10.0))
|
||||
.padding(Padding::new(8.0))
|
||||
.into();
|
||||
|
||||
let mut column_content = vec![
|
||||
name,
|
||||
description_label,
|
||||
description,
|
||||
];
|
||||
|
||||
if !plugin.plugin_description.is_empty() {
|
||||
let description_label: Element<_> = text("Description")
|
||||
.size(14)
|
||||
.style(TextStyle::Subtitle)
|
||||
.into();
|
||||
|
||||
let description_label = container(description_label)
|
||||
.padding(Padding::from([0.0, 0.0, 0.0, 8.0]))
|
||||
.into();
|
||||
|
||||
let description = container(text(&plugin.plugin_description))
|
||||
.padding(Padding::new(8.0))
|
||||
.into();
|
||||
|
||||
column_content.push(description_label);
|
||||
column_content.push(description);
|
||||
}
|
||||
|
||||
for element in preferences_ui(plugin_id.clone(), None, &plugin.preferences, &self.preference_user_data) {
|
||||
column_content.push(element)
|
||||
}
|
||||
|
|
@ -501,7 +505,7 @@ impl Application for ManagementAppModel {
|
|||
}
|
||||
|
||||
let column: Element<_> = column(column_content)
|
||||
.padding(Padding::from([0.0, 5.0, 0.0, 0.0]))
|
||||
.padding(Padding::from([0.0, 4.0, 0.0, 0.0]))
|
||||
.into();
|
||||
|
||||
let column: Element<_> = scrollable(column)
|
||||
|
|
@ -511,7 +515,7 @@ impl Application for ManagementAppModel {
|
|||
container(column)
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.padding(Padding::from([5.0, 0.0]))
|
||||
.padding(Padding::from([4.0, 0.0]))
|
||||
.into()
|
||||
}
|
||||
SelectedItem::Entrypoint { plugin_id, entrypoint_id } => {
|
||||
|
|
@ -520,36 +524,37 @@ impl Application for ManagementAppModel {
|
|||
let entrypoint = plugin.entrypoints.get(entrypoint_id).unwrap();
|
||||
|
||||
let name = container(text(&entrypoint.entrypoint_name))
|
||||
.padding(Padding::new(10.0))
|
||||
.into();
|
||||
|
||||
let description_label: Element<_> = text("Description")
|
||||
.font(Font {
|
||||
weight: Weight::Bold,
|
||||
..Font::DEFAULT
|
||||
})
|
||||
.into();
|
||||
|
||||
let description_label = container(description_label)
|
||||
.padding(Padding::from([0.0, 0.0, 0.0, 10.0]))
|
||||
.into();
|
||||
|
||||
let description = container(text(&entrypoint.entrypoint_description))
|
||||
.padding(Padding::new(10.0))
|
||||
.padding(Padding::new(8.0))
|
||||
.into();
|
||||
|
||||
let mut column_content = vec![
|
||||
name,
|
||||
description_label,
|
||||
description,
|
||||
];
|
||||
|
||||
if !entrypoint.entrypoint_description.is_empty() {
|
||||
let description_label: Element<_> = text("Description")
|
||||
.size(14)
|
||||
.style(TextStyle::Subtitle)
|
||||
.into();
|
||||
|
||||
let description_label = container(description_label)
|
||||
.padding(Padding::from([0.0, 0.0, 0.0, 8.0]))
|
||||
.into();
|
||||
|
||||
let description = container(text(&entrypoint.entrypoint_description))
|
||||
.padding(Padding::new(8.0))
|
||||
.into();
|
||||
|
||||
column_content.push(description_label);
|
||||
column_content.push(description);
|
||||
}
|
||||
|
||||
for element in preferences_ui(plugin_id.clone(), Some(entrypoint_id.clone()), &entrypoint.preferences, &self.preference_user_data) {
|
||||
column_content.push(element)
|
||||
}
|
||||
|
||||
let column: Element<_> = column(column_content)
|
||||
.padding(Padding::from([0.0, 5.0, 0.0, 0.0]))
|
||||
.padding(Padding::from([0.0, 4.0, 0.0, 0.0]))
|
||||
.into();
|
||||
|
||||
let column: Element<_> = scrollable(column)
|
||||
|
|
@ -559,7 +564,7 @@ impl Application for ManagementAppModel {
|
|||
container(column)
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.padding(Padding::from([5.0, 0.0]))
|
||||
.padding(Padding::from([4.0, 0.0]))
|
||||
.into()
|
||||
}
|
||||
SelectedItem::NewPlugin { repository_url } => {
|
||||
|
|
@ -575,7 +580,7 @@ impl Application for ManagementAppModel {
|
|||
]).into();
|
||||
|
||||
container(content)
|
||||
.padding(Padding::new(10.0))
|
||||
.padding(Padding::new(8.0))
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.center_x()
|
||||
|
|
@ -627,7 +632,7 @@ impl Application for ManagementAppModel {
|
|||
};
|
||||
|
||||
let sidebar: Element<_> = column(vec![top_button, sidebar_content, progress_bar_text])
|
||||
.padding(Padding::new(4.0))
|
||||
.padding(Padding::new(8.0))
|
||||
.into();
|
||||
|
||||
let separator: Element<_> = vertical_rule(1)
|
||||
|
|
@ -637,7 +642,7 @@ impl Application for ManagementAppModel {
|
|||
.into();
|
||||
|
||||
container(content)
|
||||
.padding(Padding::new(3.0))
|
||||
.padding(Padding::new(4.0))
|
||||
.into()
|
||||
}
|
||||
|
||||
|
|
@ -954,14 +959,12 @@ fn preferences_ui<'a>(
|
|||
let preference_name = preference_name.to_owned();
|
||||
|
||||
let preference_label: Element<_> = text(&preference_name)
|
||||
.font(Font {
|
||||
weight: Weight::Bold,
|
||||
..Font::DEFAULT
|
||||
})
|
||||
.size(14)
|
||||
.style(TextStyle::Subtitle)
|
||||
.into();
|
||||
|
||||
let preference_label = container(preference_label)
|
||||
.padding(Padding::from([0.0, 0.0, 0.0, 10.0]))
|
||||
.padding(Padding::from([0.0, 0.0, 0.0, 8.0]))
|
||||
.into();
|
||||
|
||||
column_content.push(preference_label);
|
||||
|
|
@ -978,7 +981,7 @@ fn preferences_ui<'a>(
|
|||
|
||||
if !description.trim().is_empty() {
|
||||
let description = container(text(description))
|
||||
.padding(Padding::new(10.0))
|
||||
.padding(Padding::from([4.0, 8.0]))
|
||||
.into();
|
||||
|
||||
column_content.push(description);
|
||||
|
|
@ -1012,7 +1015,7 @@ fn preferences_ui<'a>(
|
|||
|
||||
let input_field = container(input_field)
|
||||
.width(Length::Fill)
|
||||
.padding(Padding::new(10.0))
|
||||
.padding(Padding::from([4.0, 8.0]))
|
||||
.into();
|
||||
|
||||
vec![input_field]
|
||||
|
|
@ -1040,7 +1043,7 @@ fn preferences_ui<'a>(
|
|||
.into();
|
||||
|
||||
let input_field = container(input_field)
|
||||
.padding(Padding::new(10.0))
|
||||
.padding(Padding::new(8.0))
|
||||
.into();
|
||||
|
||||
vec![input_field]
|
||||
|
|
@ -1077,7 +1080,7 @@ fn preferences_ui<'a>(
|
|||
.into();
|
||||
|
||||
let input_field = container(input_field)
|
||||
.padding(Padding::new(10.0))
|
||||
.padding(Padding::new(8.0))
|
||||
.width(Length::Fill)
|
||||
.into();
|
||||
|
||||
|
|
@ -1104,7 +1107,7 @@ fn preferences_ui<'a>(
|
|||
.into();
|
||||
|
||||
let input_field = container(input_field)
|
||||
.padding(Padding::new(10.0))
|
||||
.padding(Padding::new(8.0))
|
||||
.into();
|
||||
|
||||
vec![input_field]
|
||||
|
|
@ -1127,17 +1130,9 @@ fn preferences_ui<'a>(
|
|||
value.remove(index);
|
||||
}
|
||||
|
||||
let item_text: Element<_> = text(value_item)
|
||||
.into();
|
||||
|
||||
let item_text: Element<_> = container(item_text)
|
||||
.padding(Padding::new(4.0))
|
||||
.into();
|
||||
|
||||
let item_text = container(item_text)
|
||||
.height(Length::Fixed(30.0))
|
||||
let item_text: Element<_> = text_input("", value_item)
|
||||
.width(Length::Fill)
|
||||
.style(ContainerStyle::Box)
|
||||
.padding(Padding::new(4.0))
|
||||
.into();
|
||||
|
||||
let remove_icon = text(icons::Bootstrap::Dash)
|
||||
|
|
@ -1154,13 +1149,18 @@ fn preferences_ui<'a>(
|
|||
new_value: new_value.clone(),
|
||||
},
|
||||
})
|
||||
.padding(Padding::from([5.0, 7.0]))
|
||||
.into();
|
||||
|
||||
let remove_button = container(remove_button)
|
||||
.padding(Padding::from([0.0, 0.0, 0.0, 8.0]))
|
||||
.into();
|
||||
|
||||
let item: Element<_> = row([item_text, remove_button])
|
||||
.into();
|
||||
|
||||
let item = container(item)
|
||||
.padding(Padding::from([5.0, 10.0]))
|
||||
.padding(Padding::from([4.0, 8.0]))
|
||||
.into();
|
||||
|
||||
item
|
||||
|
|
@ -1198,9 +1198,14 @@ fn preferences_ui<'a>(
|
|||
let add_button: Element<_> = button(add_icon)
|
||||
.style(ButtonStyle::Primary)
|
||||
.on_press_maybe(add_msg)
|
||||
.padding(Padding::from([5.0, 7.0]))
|
||||
.into();
|
||||
|
||||
let add_text_input: Element<_> = text_input("", &new_value)
|
||||
let add_button: Element<_> = container(add_button)
|
||||
.padding(Padding::from([0.0, 0.0, 0.0, 8.0]))
|
||||
.into();
|
||||
|
||||
let add_text_input: Element<_> = text_input("Enter value...", &new_value)
|
||||
.on_input(move |new_value| ManagementAppMsg::UpdatePreferenceValue {
|
||||
plugin_id: plugin_id.clone(),
|
||||
entrypoint_id: entrypoint_id.clone(),
|
||||
|
|
@ -1216,7 +1221,7 @@ fn preferences_ui<'a>(
|
|||
.into();
|
||||
|
||||
let add_item: Element<_> = container(add_item)
|
||||
.padding(Padding::new(10.0))
|
||||
.padding(Padding::new(8.0))
|
||||
.into();
|
||||
|
||||
items.push(add_item);
|
||||
|
|
@ -1242,17 +1247,9 @@ fn preferences_ui<'a>(
|
|||
value.remove(index);
|
||||
}
|
||||
|
||||
let item_text: Element<_> = text(value_item)
|
||||
.into();
|
||||
|
||||
let item_text: Element<_> = container(item_text)
|
||||
.padding(Padding::new(4.0))
|
||||
.into();
|
||||
|
||||
let item_text = container(item_text)
|
||||
.height(Length::Fixed(30.0))
|
||||
let item_text = text_input("", &format!("{}", value_item))
|
||||
.width(Length::Fill)
|
||||
.style(ContainerStyle::Box)
|
||||
.padding(Padding::new(4.0))
|
||||
.into();
|
||||
|
||||
let remove_icon = text(icons::Bootstrap::Dash)
|
||||
|
|
@ -1269,13 +1266,18 @@ fn preferences_ui<'a>(
|
|||
new_value: new_value.clone(),
|
||||
},
|
||||
})
|
||||
.padding(Padding::from([5.0, 7.0]))
|
||||
.into();
|
||||
|
||||
let remove_button = container(remove_button)
|
||||
.padding(Padding::from([0.0, 0.0, 0.0, 8.0]))
|
||||
.into();
|
||||
|
||||
let item: Element<_> = row([item_text, remove_button])
|
||||
.into();
|
||||
|
||||
let item = container(item)
|
||||
.padding(Padding::from([5.0, 10.0]))
|
||||
.padding(Padding::from([4.0, 8.0]))
|
||||
.into();
|
||||
|
||||
item
|
||||
|
|
@ -1307,8 +1309,12 @@ fn preferences_ui<'a>(
|
|||
new_value: 0.0,
|
||||
},
|
||||
})
|
||||
.padding(Padding::from([5.0, 7.0]))
|
||||
.into();
|
||||
|
||||
let add_button: Element<_> = container(add_button)
|
||||
.padding(Padding::from([0.0, 0.0, 0.0, 8.0]))
|
||||
.into();
|
||||
|
||||
let add_number_input: Element<_> = number_input(new_value, f64::MAX, std::convert::identity)
|
||||
.bounds((f64::MIN, f64::MAX))
|
||||
|
|
@ -1331,7 +1337,7 @@ fn preferences_ui<'a>(
|
|||
.into();
|
||||
|
||||
let add_item: Element<_> = container(add_item)
|
||||
.padding(Padding::new(10.0))
|
||||
.padding(Padding::new(8.0))
|
||||
.into();
|
||||
|
||||
items.push(add_item);
|
||||
|
|
@ -1356,17 +1362,9 @@ fn preferences_ui<'a>(
|
|||
value.remove(index);
|
||||
}
|
||||
|
||||
let item_text: Element<_> = text(value_item)
|
||||
.into();
|
||||
|
||||
let item_text: Element<_> = container(item_text)
|
||||
.padding(Padding::new(4.0))
|
||||
.into();
|
||||
|
||||
let item_text = container(item_text)
|
||||
.height(Length::Fixed(30.0))
|
||||
let item_text: Element<_> = text_input("", value_item)
|
||||
.width(Length::Fill)
|
||||
.style(ContainerStyle::Box)
|
||||
.padding(Padding::new(4.0))
|
||||
.into();
|
||||
|
||||
let remove_icon = text(icons::Bootstrap::Dash)
|
||||
|
|
@ -1383,13 +1381,18 @@ fn preferences_ui<'a>(
|
|||
new_value: new_value.clone(),
|
||||
},
|
||||
})
|
||||
.padding(Padding::from([5.0, 7.0]))
|
||||
.into();
|
||||
|
||||
let remove_button = container(remove_button)
|
||||
.padding(Padding::from([0.0, 0.0, 0.0, 8.0]))
|
||||
.into();
|
||||
|
||||
let item: Element<_> = row([item_text, remove_button])
|
||||
.into();
|
||||
|
||||
let item = container(item)
|
||||
.padding(Padding::from([5.0, 10.0]))
|
||||
.padding(Padding::from([4.0, 8.0]))
|
||||
.into();
|
||||
|
||||
item
|
||||
|
|
@ -1429,6 +1432,11 @@ fn preferences_ui<'a>(
|
|||
let add_button: Element<_> = button(add_icon)
|
||||
.style(ButtonStyle::Primary)
|
||||
.on_press_maybe(add_msg)
|
||||
.padding(Padding::from([5.0, 7.0]))
|
||||
.into();
|
||||
|
||||
let add_button: Element<_> = container(add_button)
|
||||
.padding(Padding::from([0.0, 0.0, 0.0, 8.0]))
|
||||
.into();
|
||||
|
||||
let enum_values: Vec<_> = enum_values.iter()
|
||||
|
|
@ -1448,15 +1456,15 @@ fn preferences_ui<'a>(
|
|||
},
|
||||
}),
|
||||
)
|
||||
.placeholder("Select value...")
|
||||
.width(Length::Fill)
|
||||
.into();
|
||||
|
||||
|
||||
let add_item: Element<_> = row([add_enum_input, add_button])
|
||||
.into();
|
||||
|
||||
let add_item: Element<_> = container(add_item)
|
||||
.padding(Padding::new(10.0))
|
||||
.padding(Padding::new(8.0))
|
||||
.into();
|
||||
|
||||
items.push(add_item);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue