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

feat(ui): anchor every ribbon dropdown and status-bar popup to its widget, flipping at window edges

Browse Source 
All ribbon dropdowns (tool dropdowns, undo/redo history, and the layer /
colour / linetype / lineweight / style combos) and all status-bar popups
(scale, units, OSNAP, isolate, filter, customization menu, layout list)
now open directly at their widget instead of at a layout-estimated
position, and flip to the other side when the panel would cross a window
edge.

Each dropdown/pill widget is wrapped in a transparent PosReport that
records its screen bounds into a thread-local map on draw. The overlays
read those bounds:
- Ribbon: Ribbon::dd_anchor(id, panel_w, win_w) returns
  (align_right, h_pad, top); position_ribbon_dropdown places the panel
  below the widget, flipping right-aligned near the right edge.
- Status bar: popup builders take (pill_bounds, win_size) and call
  popup::position_statusbar_popup / popup_anchor, opening just above the
  pill and flipping left/right at the window edge.

The window size is now tracked (win_size, set on WindowResized). The old
layout estimators compute_dropdown_left / compute_layer_combo_left /
compute_prop_combo_left / compute_history_dropdown_left and
osnap_popup_right_offset are deleted.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Hakan SevenandClaude Opus 4.8 committed 2026-07-05 18:51:54 +03:00
1 parent 56e48b8d0f
commit 39043e6e56
13 files changed
+310 -383
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/ui/ribbon/widgets.rs
+16 -110
View File
@@ -12,7 +12,7 @@ use iced::widget::{button, column, container, row, svg, text, tooltip};
use iced::{Background, Border, Color, Element, Fill, Length, Padding, Theme};
use crate::app::Message;
use crate::modules::{IconKind, ModuleEvent, RibbonGroup, RibbonItem, StyleKey, ToolDef};
use crate::modules::{IconKind, ModuleEvent, RibbonItem, StyleKey, ToolDef};
use crate::ui::wrap_bar::PosReport;
use crate::ui::icons;
use crate::ui::properties::{acad_color_display, LwItem};
@@ -744,9 +744,13 @@ pub(super) fn render_large<'a>(
let tools_row3 = make_tool_row(row3);
container(
column![combo_btn, tools_row2, tools_row3]
.spacing(3)
.align_x(iced::Left),
column![
PosReport::new(LAYER_COMBO_ID, combo_btn),
tools_row2,
tools_row3
]
.spacing(3)
.align_x(iced::Left),
)
.width(Length::Fixed(COMBO_W))
.height(Fill)
@@ -864,9 +868,13 @@ pub(super) fn render_large<'a>(
let lw_row = prop_row(LwItem(active_lineweight).to_string(), PROP_LW_ID, None);
let combos = container(
column![color_row, lt_row, lw_row]
.spacing(2)
.align_x(iced::Left),
column![
PosReport::new(PROP_COLOR_ID, color_row),
PosReport::new(PROP_LINETYPE_ID, lt_row),
PosReport::new(PROP_LW_ID, lw_row),
]
.spacing(2)
.align_x(iced::Left),
)
.height(Fill)
.align_y(iced::Center)
@@ -968,7 +976,7 @@ pub(super) fn render_large<'a>(
};
let mut col_items: Vec<Element<Message>> =
vec![container(row![combo_btn, items_panel].spacing(0))
vec![container(row![PosReport::new(*combo_id, combo_btn), items_panel].spacing(0))
.width(Fill)
.into()];
for row_tools in rows {
@@ -990,108 +998,6 @@ pub(super) fn render_large<'a>(
}
}
// ── Dropdown position helpers ──────────────────────────────────────────────
/// Calculate the left pixel offset of a dropdown button inside the ribbon tool area.
pub(super) fn compute_dropdown_left(groups: &[RibbonGroup], open_id: &str) -> f32 {
let sum_with_spacing = |widths: &[f32]| -> f32 {
widths
.iter()
.enumerate()
.map(|(i, &w)| if i == 0 { w } else { 2.0 + w })
.sum::<f32>()
};
let next_item_x = |widths: &[f32]| -> f32 {
if widths.is_empty() {
0.0
} else {
sum_with_spacing(widths) + 2.0
}
};
let mut x = 0.0f32;
for (g_idx, group) in groups.iter().enumerate() {
if g_idx > 0 {
x += 1.0;
}
x += 4.0;
let mut row_widths: Vec<f32> = Vec::new();
let mut small_col_w: f32 = 0.0;
let mut small_col_n: usize = 0;
for item in &group.tools {
let is_large = matches!(
item,
RibbonItem::LargeTool(_)
| RibbonItem::LargeDropdown { .. }
| RibbonItem::LayerComboGroup { .. }
| RibbonItem::PropertiesGroup { .. }
| RibbonItem::StyleComboGroup { .. }
);
let id: &str = match item {
RibbonItem::LargeTool(t) => t.id,
RibbonItem::LargeDropdown { id, .. } => *id,
RibbonItem::Tool(t) => t.id,
RibbonItem::Dropdown { id, .. } => *id,
RibbonItem::LayerComboGroup { .. } => LAYER_COMBO_ID,
RibbonItem::PropertiesGroup { match_prop } => match_prop.id,
RibbonItem::StyleComboGroup { combo_id, .. } => combo_id,
};
let item_w = match item {
RibbonItem::LargeTool(_) | RibbonItem::LargeDropdown { .. } => LARGE_W,
RibbonItem::LayerComboGroup { .. } => LARGE_W * 2.5,
RibbonItem::PropertiesGroup { .. } => LARGE_W + 4.0 + 130.0,
RibbonItem::StyleComboGroup { .. } => LARGE_W * 2.3,
RibbonItem::Dropdown { .. } => SMALL_W + ARROW_W,
_ => SMALL_W,
};
if is_large {
if small_col_n > 0 {
row_widths.push(small_col_w);
small_col_w = 0.0;
small_col_n = 0;
}
if id == open_id {
return x + next_item_x(&row_widths);
}
row_widths.push(item_w);
} else {
if id == open_id {
return x + next_item_x(&row_widths);
}
small_col_w = small_col_w.max(item_w);
small_col_n += 1;
if small_col_n == 3 {
row_widths.push(small_col_w);
small_col_w = 0.0;
small_col_n = 0;
}
}
}
if small_col_n > 0 {
row_widths.push(small_col_w);
}
x += sum_with_spacing(&row_widths) + 4.0;
}
60.0
}
pub(super) fn compute_layer_combo_left(groups: &[RibbonGroup]) -> f32 {
compute_dropdown_left(groups, LAYER_COMBO_ID)
}
/// Left offset for a Properties combo dropdown.
pub(super) fn compute_prop_combo_left(groups: &[RibbonGroup], _dd_id: &str) -> f32 {
let base = compute_dropdown_left(groups, "MATCHPROP");
base + LARGE_W + 4.0
}
// ── Message helpers ────────────────────────────────────────────────────────
#[allow(dead_code)]