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/ui/ribbon/mod.rs
+15 -15
View File
@@ -423,7 +423,7 @@ impl Ribbon {
button(text(module.title()).size(12))
.on_press(Message::RibbonSelectTab(i))
.style(move |theme: &Theme, status| {
let palette = theme.extended_palette();
let palette = theme.palette();
let accent = if is_contextual {
palette.warning.base
} else {
@@ -470,9 +470,9 @@ impl Ribbon {
border: Border {
color: if is_active {
if is_contextual {
theme.extended_palette().warning.base.color
theme.palette().warning.base.color
} else {
theme.extended_palette().primary.base.color
theme.palette().primary.base.color
}
} else {
Color::TRANSPARENT
@@ -526,7 +526,7 @@ impl Ribbon {
let tab_bar = container(tab_row)
.style(|theme: &Theme| container::Style {
background: Some(Background::Color(
theme.extended_palette().background.base.color,
theme.palette().background.base.color,
)),
..Default::default()
})
@@ -647,10 +647,10 @@ impl Ribbon {
))
.style(|theme: &Theme| container::Style {
background: Some(Background::Color(
theme.extended_palette().background.weakest.color,
theme.palette().background.weakest.color,
)),
border: Border {
color: theme.extended_palette().background.neutral.color,
color: theme.palette().background.neutral.color,
width: 1.0,
radius: 0.0.into(),
},
@@ -672,10 +672,10 @@ impl Ribbon {
let tool_bar = container(tool_area)
.style(|theme: &Theme| container::Style {
background: Some(Background::Color(
theme.extended_palette().background.weakest.color,
theme.palette().background.weakest.color,
)),
border: Border {
color: theme.extended_palette().background.neutral.color,
color: theme.palette().background.neutral.color,
width: 1.0,
radius: 0.0.into(),
},
@@ -827,7 +827,7 @@ impl Ribbon {
.style(move |theme: &Theme| iced::widget::text::Style {
color: (!is_current).then_some(
theme
.extended_palette()
.palette()
.background
.base
.text
@@ -895,7 +895,7 @@ impl Ribbon {
.style(move |theme: &Theme| container::Style {
background: Some(Background::Color(lc)),
border: Border {
color: theme.extended_palette().background.strong.color,
color: theme.palette().background.strong.color,
width: 1.0,
radius: 1.0.into(),
},
@@ -924,7 +924,7 @@ impl Ribbon {
.style(move |theme: &Theme| iced::widget::text::Style {
color: (!is_active).then_some(
theme
.extended_palette()
.palette()
.background
.base
.text
@@ -981,7 +981,7 @@ impl Ribbon {
.padding([3, 4])
.style(|theme: &Theme| container::Style {
border: Border {
color: theme.extended_palette().background.neutral.color,
color: theme.palette().background.neutral.color,
width: 1.0,
radius: 0.0.into(),
},
@@ -1055,7 +1055,7 @@ impl Ribbon {
.style(move |theme: &Theme| iced::widget::text::Style {
color: (!is_sel).then_some(
theme
.extended_palette()
.palette()
.background
.base
.text
@@ -1154,7 +1154,7 @@ impl Ribbon {
.style(move |theme: &Theme| iced::widget::text::Style {
color: (!is_cur).then_some(
theme
.extended_palette()
.palette()
.background
.base
.text
@@ -1207,7 +1207,7 @@ impl Ribbon {
.style(move |theme: &Theme| iced::widget::text::Style {
color: (!is_cur).then_some(
theme
.extended_palette()
.palette()
.background
.base
.text