fix(ui): make modal layouts intrinsic

Pin Iced 0.15 so dialogs can measure content before distributing the resolved frame across child panels. Keep the web plugin notice compact and non-resizable.\n\nCloses #582
This commit is contained in:
Hakan Seven committed 2026-07-30 14:47:28 +03:00
1 parent 284d6ef517
commit 3ab8dc3ca5
59 files changed
+2197 -1652

No files matched your search

+27 -26
View File
@@ -2,17 +2,17 @@
use crate::app::Message;
use iced::widget::{button, column, container, row, scrollable, text, text_input, Space};
use iced::{Background, Element, Fill, Theme};
use iced::{Background, Element, Theme};
fn muted_style(theme: &Theme) -> iced::widget::text::Style {
iced::widget::text::Style {
color: Some(theme.extended_palette().background.base.text.scale_alpha(0.68)),
color: Some(theme.palette().background.base.text.scale_alpha(0.68)),
}
}
fn primary_style(theme: &Theme) -> iced::widget::text::Style {
iced::widget::text::Style {
color: Some(theme.extended_palette().primary.base.color),
color: Some(theme.palette().primary.base.color),
}
}
@@ -36,26 +36,26 @@ fn list_item(active: bool) -> impl Fn(&Theme, button::Status) -> button::Style {
}
}
fn hdivider<'a>() -> Element<'a, Message> {
container(Space::new().width(Fill).height(1))
.width(Fill)
fn hdivider<'a>(width: iced::Length) -> Element<'a, Message> {
container(Space::new().width(width).height(1))
.width(width)
.height(1)
.style(|theme: &Theme| container::Style {
background: Some(Background::Color(
theme.extended_palette().background.neutral.color,
theme.palette().background.neutral.color,
)),
..Default::default()
})
.into()
}
fn vsep<'a>() -> Element<'a, Message> {
container(Space::new().width(1).height(Fill))
fn vsep<'a>(height: iced::Length) -> Element<'a, Message> {
container(Space::new().width(1).height(height))
.width(1)
.height(Fill)
.height(height)
.style(|theme: &Theme| container::Style {
background: Some(Background::Color(
theme.extended_palette().background.neutral.color,
theme.palette().background.neutral.color,
)),
..Default::default()
})
@@ -67,6 +67,7 @@ pub fn view_window<'a>(
selected: &'a str,
rename_buf: &'a str,
current: String,
sizing: crate::ui::modal::ModalSizing,
) -> Element<'a, Message> {
let is_model = selected == "Model";
@@ -87,7 +88,7 @@ pub fn view_window<'a>(
}
})
.padding([4, 10]),
Space::new().width(Fill),
Space::new().width(sizing.width),
button(
row![
crate::ui::icons::themed_arrow_left(9.0),
@@ -120,11 +121,11 @@ pub fn view_window<'a>(
)
.style(|theme: &Theme| container::Style {
background: Some(Background::Color(
theme.extended_palette().background.weakest.color,
theme.palette().background.weakest.color,
)),
..Default::default()
})
.width(Fill)
.width(sizing.width)
.padding([5, 8]);
// ── Left: Layout list ─────────────────────────────────────────────────
@@ -143,7 +144,7 @@ pub fn view_window<'a>(
.on_press(Message::LayoutManagerSelect(name.clone()))
.style(list_item(is_sel))
.padding([5, 10])
.width(Fill)
.width(sizing.width)
.into()
})
.collect();
@@ -151,17 +152,17 @@ pub fn view_window<'a>(
let layout_list = container(
column![
text("Layouts").size(10).style(muted_style),
container(scrollable(column(list_items).spacing(2)).height(Fill))
container(scrollable(column(list_items).spacing(2)).height(sizing.height))
.style(container::bordered_box)
.width(Fill)
.height(Fill)
.width(sizing.width)
.height(sizing.height)
.padding(2),
]
.spacing(4)
.height(Fill),
.height(sizing.height),
)
.width(220)
.height(Fill)
.height(sizing.height)
.padding(iced::Padding {
top: 12.0,
right: 8.0,
@@ -221,19 +222,19 @@ pub fn view_window<'a>(
]
.spacing(8),
)
.width(Fill)
.width(sizing.width)
.padding([12, 12]);
let body = row![layout_list, vsep(), details].height(Fill);
let body = row![layout_list, vsep(sizing.height), details].height(sizing.height);
container(column![toolbar, hdivider(), body].spacing(0))
container(column![toolbar, hdivider(sizing.width), body].spacing(0))
.style(|theme: &Theme| container::Style {
background: Some(Background::Color(
theme.extended_palette().background.base.color,
theme.palette().background.base.color,
)),
..Default::default()
})
.width(Fill)
.height(Fill)
.width(sizing.width)
.height(sizing.height)
.into()
}