1b-agent/OneCAD-Draft
1
0 Fork 0
forked from 1b-agent/opencadstudio-upstream
Code Pull Requests Activity

fix(ui): make modal layouts intrinsic

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/app/view/controls.rs
+7 -7
View File
@@ -34,13 +34,13 @@ pub(super) fn viewport_controls<'a>(
| iced::widget::button::Status::Pressed
)
.then_some(Background::Color(
theme.extended_palette().danger.weak.color
theme.palette().danger.weak.color
)),
border: Border {
radius: 3.0.into(),
..Default::default()
},
text_color: theme.extended_palette().danger.base.color,
text_color: theme.palette().danger.base.color,
..Default::default()
})
};
@@ -56,7 +56,7 @@ pub(super) fn viewport_controls<'a>(
.on_press(msg)
.padding([4, 6])
.style(move |theme: &Theme, status| {
let palette = theme.extended_palette();
let palette = theme.palette();
let pair = match (active, status) {
(_, iced::widget::button::Status::Hovered) => {
Some(palette.background.strong)
@@ -79,7 +79,7 @@ pub(super) fn viewport_controls<'a>(
};
// Render-mode picker, restyled borderless so the outer chip frames it.
let picker = iced::widget::pick_list(
let picker = crate::ui::pick_list(
render_modes,
Some(RenderModeChoice(render_mode)),
|c| Message::SetRenderMode(c.0),
@@ -87,7 +87,7 @@ pub(super) fn viewport_controls<'a>(
.text_size(11)
.padding([4, 6])
.style(move |theme: &Theme, _| {
let text = theme.extended_palette().background.base.text;
let text = theme.palette().background.base.text;
iced::widget::pick_list::Style {
background: Background::Color(iced::Color::TRANSPARENT),
border: Border {
@@ -105,7 +105,7 @@ pub(super) fn viewport_controls<'a>(
container(iced::widget::Space::new().width(1.0).height(16.0)).style(|theme: &Theme| {
iced::widget::container::Style {
background: Some(Background::Color(
theme.extended_palette().background.neutral.color.scale_alpha(0.7)
theme.palette().background.neutral.color.scale_alpha(0.7)
)),
..Default::default()
}
@@ -156,7 +156,7 @@ pub(super) fn viewport_controls<'a>(
container(bar)
.padding(2)
.style(|theme: &Theme| {
let palette = theme.extended_palette();
let palette = theme.palette();
iced::widget::container::Style {
background: Some(Background::Color(
palette.background.weak.color.scale_alpha(0.92)