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/statusbar/mod.rs
+48 -56
View File
@@ -21,7 +21,16 @@ pub const LAYOUT_RENAME_INPUT_ID: &str = "layout_rename_input";
use crate::app::Message;
use crate::snap::Snapper;
use crate::ui::statusbar::statusbar_config::{StatusBarConfig, StatusPill};
use crate::ui::wrap_bar::{WrapBar, WrapFlow};
use crate::ui::wrap_bar::{PosReport, WrapBar, WrapFlow};
// PosReport ids for anchoring each status-bar popup directly to its pill.
pub const SB_OSNAP_ID: &str = "SB_OSNAP";
pub const SB_SCALE_ID: &str = "SB_SCALE";
pub const SB_UNITS_ID: &str = "SB_UNITS";
pub const SB_ISOLATE_ID: &str = "SB_ISOLATE";
pub const SB_FILTER_ID: &str = "SB_FILTER";
pub const SB_MENU_ID: &str = "SB_MENU";
pub const SB_LAYOUTLIST_ID: &str = "SB_LAYOUTLIST";
#[derive(Clone, Default)]
pub struct StatusBar {
@@ -189,7 +198,13 @@ impl StatusBar {
);
}
if vis(StatusPill::Osnap) {
pills.push(osnap_btn(osnap_active, snapper.snap_enabled, popup_open).into());
pills.push(
PosReport::new(
SB_OSNAP_ID,
osnap_btn(osnap_active, snapper.snap_enabled, popup_open),
)
.into(),
);
}
if vis(StatusPill::Space) {
pills.push(
@@ -201,16 +216,19 @@ impl StatusBar {
);
}
if vis(StatusPill::Scale) {
pills.push(scale_element);
pills.push(PosReport::new(SB_SCALE_ID, scale_element).into());
}
if vis(StatusPill::Units) {
pills.push(
tip(
units_btn(
crate::ui::popup::units_popup::unit_short(insertion_units),
units_popup_open,
PosReport::new(
SB_UNITS_ID,
tip(
units_btn(
crate::ui::popup::units_popup::unit_short(insertion_units),
units_popup_open,
),
"Drawing Units (INSUNITS)\nClick to change",
),
"Drawing Units (INSUNITS)\nClick to change",
)
.into(),
);
@@ -230,9 +248,12 @@ impl StatusBar {
}
if vis(StatusPill::Isolate) {
pills.push(
tip(
toggle_pill(crate::ui::icons::ST_ISOLATE, isolation_active, Message::ToggleIsolatePopup),
"Isolate Objects\nClick for Isolate / Hide / End",
PosReport::new(
SB_ISOLATE_ID,
tip(
toggle_pill(crate::ui::icons::ST_ISOLATE, isolation_active, Message::ToggleIsolatePopup),
"Isolate Objects\nClick for Isolate / Hide / End",
),
)
.into(),
);
@@ -248,13 +269,16 @@ impl StatusBar {
}
if vis(StatusPill::SelFilter) {
pills.push(
tip(
toggle_pill(
crate::ui::icons::ST_FILTER,
selection_filter_active,
Message::ToggleSelectionFilterPopup,
PosReport::new(
SB_FILTER_ID,
tip(
toggle_pill(
crate::ui::icons::ST_FILTER,
selection_filter_active,
Message::ToggleSelectionFilterPopup,
),
"Selection Filtering\nLimit which object types can be picked",
),
"Selection Filtering\nLimit which object types can be picked",
)
.into(),
);
@@ -288,9 +312,12 @@ impl StatusBar {
}
// Customization handle: opens the pill show/hide menu.
pills.push(
tip(
customize_btn(),
"Customization\nShow or hide status-bar items",
PosReport::new(
SB_MENU_ID,
tip(
customize_btn(),
"Customization\nShow or hide status-bar items",
),
)
.into(),
);
@@ -301,7 +328,7 @@ impl StatusBar {
// wrap in their own flow; WrapBar stacks the two areas so a wrapped tab
// never shares a row with a pill.
let mut left: Vec<Element<'_, Message>> = Vec::new();
left.push(menu_btn.into());
left.push(PosReport::new(SB_LAYOUTLIST_ID, menu_btn).into());
if show_layout_tabs {
for name in layouts {
let is_active = name == current_layout;
@@ -408,41 +435,6 @@ fn tip_node<'a>(content: Element<'a, Message>, body: Element<'a, Message>) -> El
/// A status-bar toggle, drawn as a tinted icon (issue #216: the old size-10
/// text labels were too small to read). The name lives in the tooltip each
/// call site already wraps it with.
/// Approximate distance (px) from the window's right edge to the right edge of
/// the Osnap button — used to anchor the OSNAP settings popup above the button
/// instead of at the window corner (#248). The status-bar pills that follow
/// Osnap are summed by estimated width (icon pills are fixed; labelled pills are
/// approximate), honouring the user's per-pill visibility. iced gives the view
/// no real layout metrics, so this positions the popup near the button rather
/// than pixel-exact.
pub fn osnap_popup_right_offset(config: &StatusBarConfig, viewport_count: usize) -> f32 {
const SP: f32 = 2.0; // right_status row spacing between pills
const TOGGLE: f32 = 33.0; // icon toggle pill (17px icon + [4,7] pad + border)
// Pills after Osnap, in bar order, with estimated widths.
let after = [
(StatusPill::Space, 58.0),
(StatusPill::Scale, 92.0),
(StatusPill::Units, 42.0),
(StatusPill::Transparency, TOGGLE),
(StatusPill::Isolate, TOGGLE),
(StatusPill::QuickProps, TOGGLE),
(StatusPill::SelFilter, TOGGLE),
(StatusPill::SelCycle, TOGGLE),
(StatusPill::Vp, 46.0),
(StatusPill::CleanScreen, TOGGLE),
];
// Bar right margin + the always-present customization button.
let mut w = 6.0 + 30.0 + SP;
for (pill, pw) in after {
let shown =
config.is_visible(pill) && !(matches!(pill, StatusPill::Vp) && viewport_count == 0);
if shown {
w += pw + SP;
}
}
w
}
fn toggle_pill(icon: &'static [u8], active: bool, msg: Message) -> Element<'static, Message> {
let color = if active { OSNAP_ON_TEXT } else { OSNAP_OFF_TEXT };
button(crate::ui::icons::tinted(icon, 17.0, color))
src/ui/statusbar/statusbar_menu.rs
+17 -25
View File
@@ -3,14 +3,18 @@
//! above the status bar, same pattern as the scale picker.
use iced::widget::{button, column, container, mouse_area, row, scrollable, text};
use iced::{Background, Border, Color, Element, Fill, Length, Padding, Theme};
use iced::{Background, Border, Color, Element, Fill, Length, Rectangle, Theme};
use crate::app::Message;
use crate::ui::statusbar::statusbar_config::{StatusBarConfig, StatusPill};
/// Full-screen overlay: transparent click-catcher + the menu panel pinned to
/// the bottom-right, just above the status bar.
pub fn statusbar_menu_overlay(config: &StatusBarConfig) -> Element<'static, Message> {
pub fn statusbar_menu_overlay(
config: &StatusBarConfig,
pill: Option<Rectangle>,
win: (f32, f32),
) -> Element<'static, Message> {
let rows: Vec<Element<'static, Message>> = StatusPill::ALL
.iter()
.map(|&pill| {
@@ -34,17 +38,8 @@ pub fn statusbar_menu_overlay(config: &StatusBarConfig) -> Element<'static, Mess
})
.width(Length::Fixed(200.0));
let positioned = container(panel)
.align_right(Fill)
.align_bottom(Fill)
.padding(Padding {
bottom: 27.0,
right: 4.0,
top: 0.0,
left: 0.0,
})
.width(Fill)
.height(Fill);
let positioned =
crate::ui::popup::position_statusbar_popup(panel.into(), pill, win, 200.0, true);
mouse_area(positioned)
.on_press(Message::CloseStatusBarMenu)
@@ -54,7 +49,12 @@ pub fn statusbar_menu_overlay(config: &StatusBarConfig) -> Element<'static, Mess
/// Dropdown listing Model + every paper layout, opened from the leftmost
/// hamburger. Pinned bottom-left just above the status bar; a click selects a
/// layout (and closes), an outside click just closes.
pub fn layout_list_overlay<'a>(layouts: &[String], current: &str) -> Element<'a, Message> {
pub fn layout_list_overlay<'a>(
layouts: &[String],
current: &str,
pill: Option<Rectangle>,
win: (f32, f32),
) -> Element<'a, Message> {
let rows: Vec<Element<'a, Message>> = layouts
.iter()
.map(|name| layout_row(name.clone(), name == current))
@@ -73,17 +73,9 @@ pub fn layout_list_overlay<'a>(layouts: &[String], current: &str) -> Element<'a,
.width(Length::Fixed(200.0))
.max_height(360.0);
let positioned = container(panel)
.align_left(Fill)
.align_bottom(Fill)
.padding(Padding {
bottom: 27.0,
left: 4.0,
top: 0.0,
right: 0.0,
})
.width(Fill)
.height(Fill);
// Hamburger is on the left → prefer left-aligned (grows right).
let positioned =
crate::ui::popup::position_statusbar_popup(panel.into(), pill, win, 200.0, false);
mouse_area(positioned)
.on_press(Message::CloseLayoutList)