AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(ui): flex-wrap the document tab bar when tabs overflow

Browse source 
The Start tab, drawing tabs and the "+" button now live in a single
WrapFlow instead of a fixed-height Row, so they spill onto lower rows
when there are more tabs than the width can hold. Drops the fixed 30px
height and the trailing Fill spacer.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Hakan Seven 2026-07-05 16:44:44 +03:00
commit a065dc939f
1 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/app/view/mod.rs
View file

@ -6,6 +6,7 @@ use super::{Message, OpenCADStudio};
use crate::scene::pick::grip::{grips_to_screen, grips_to_screen_paper, grips_to_screen_rte}; use crate::scene::pick::grip::{grips_to_screen, grips_to_screen_paper, grips_to_screen_rte};
use crate::scene::view::viewport_pane::ViewportPane; use crate::scene::view::viewport_pane::ViewportPane;
use crate::scene::{VIEWCUBE_PAD, VIEWCUBE_REGION_PX}; use crate::scene::{VIEWCUBE_PAD, VIEWCUBE_REGION_PX};
use crate::ui::wrap_bar::WrapFlow;
use iced::widget::{ use iced::widget::{
button, column, container, mouse_area, pane_grid, responsive, row, shader, stack, text, Row, button, column, container, mouse_area, pane_grid, responsive, row, shader, stack, text, Row,
Space, Space,
@ -1765,7 +1766,9 @@ pub(super) fn doc_tab_bar<'a>(tabs: &'a [DocumentTab], active_tab: usize) -> Ele
a: 1.0, a: 1.0,
}; };
let mut bar = Row::new().spacing(0).align_y(iced::Center); // Document tabs live in a flex-wrap flow so they spill onto lower rows when
// there are more tabs than the width can hold on one line.
let mut items: Vec<Element<'_, Message>> = Vec::new();
for (idx, tab) in tabs.iter().enumerate() { for (idx, tab) in tabs.iter().enumerate() {
let is_active = idx == active_tab; let is_active = idx == active_tab;
@ -1854,19 +1857,21 @@ pub(super) fn doc_tab_bar<'a>(tabs: &'a [DocumentTab], active_tab: usize) -> Ele
row![title_btn, close_btn].spacing(0).align_y(iced::Center) row![title_btn, close_btn].spacing(0).align_y(iced::Center)
}; };
bar = bar.push( items.push(
container(row_inner).style(move |_: &Theme| container::Style { container(row_inner)
border: Border { .style(move |_: &Theme| container::Style {
color: if is_active { border: Border {
BORDER_COLOR color: if is_active {
} else { BORDER_COLOR
Color::TRANSPARENT } else {
Color::TRANSPARENT
},
width: if is_active { 1.0 } else { 0.0 },
radius: 0.0.into(),
}, },
width: if is_active { 1.0 } else { 0.0 }, ..Default::default()
radius: 0.0.into(), })
}, .into(),
..Default::default()
}),
); );
} }
@ -1890,10 +1895,9 @@ pub(super) fn doc_tab_bar<'a>(tabs: &'a [DocumentTab], active_tab: usize) -> Ele
..Default::default() ..Default::default()
}); });
bar = bar.push(new_btn); items.push(new_btn.into());
bar = bar.push(iced::widget::Space::new().width(Fill));
container(bar) container(WrapFlow::new(items).spacing_x(0.0).row_h(30.0))
.style(|_: &Theme| container::Style { .style(|_: &Theme| container::Style {
background: Some(Background::Color(BAR_BG)), background: Some(Background::Color(BAR_BG)),
border: Border { border: Border {
@ -1903,7 +1907,6 @@ pub(super) fn doc_tab_bar<'a>(tabs: &'a [DocumentTab], active_tab: usize) -> Ele
}, },
..Default::default() ..Default::default()
}) })
.height(30)
.width(Fill) .width(Fill)
.padding([0, 2]) .padding([0, 2])
.into() .into()