forked from 1b-agent/opencadstudio-upstream
Align spline fit properties and menu arrows
This commit is contained in:
1 parent
753fa17b68
commit
14b98231f5
5 files changed
+19
-14
No files matched your search
@@ -7,7 +7,7 @@ use iced::{Element, Fill, Theme};
|
||||
|
||||
use super::widgets::{
|
||||
make_icon, make_tip, muted_text_style, popup_panel_style, popup_row_style, tip_style,
|
||||
tool_btn_style,
|
||||
tool_btn_style, LARGE_DROPDOWN_ARROW_SIZE,
|
||||
};
|
||||
use super::{dropdown_backdrop, position_ribbon_dropdown, Ribbon};
|
||||
use crate::app::Message;
|
||||
@@ -21,6 +21,7 @@ const SCALE: f32 = 0.7;
|
||||
const CELL: f32 = 36.0 * SCALE;
|
||||
const GAP: f32 = 3.0 * SCALE;
|
||||
const OPTION_HEIGHT: f32 = 30.0 * SCALE;
|
||||
const GROUP_TITLE_ARROW_SIZE: f32 = LARGE_DROPDOWN_ARROW_SIZE * 1.5;
|
||||
|
||||
pub(super) struct Tool {
|
||||
pub command: &'static str,
|
||||
@@ -170,9 +171,9 @@ pub(super) fn group_title<'a>(title: &'static str, open: &Option<String>) -> Ele
|
||||
};
|
||||
let expanded = open.as_deref().and_then(parent_panel) == Some(panel.id);
|
||||
let arrow = if expanded {
|
||||
icons::themed_arrow_up(7.0)
|
||||
icons::themed_arrow_up(GROUP_TITLE_ARROW_SIZE)
|
||||
} else {
|
||||
icons::themed_arrow_down(7.0)
|
||||
icons::themed_arrow_down(GROUP_TITLE_ARROW_SIZE)
|
||||
};
|
||||
PosReport::new(
|
||||
panel.id,
|
||||
|
||||
@@ -63,6 +63,8 @@ pub(super) const SMALL_W: f32 = ROW_H;
|
||||
pub(super) const ARROW_W: f32 = ROW_H * 0.4;
|
||||
/// Height of the ▾ strip at the bottom of a large dropdown.
|
||||
pub(super) const LARGE_ARR: f32 = ROW_H * 0.55;
|
||||
/// Arrow size used under large dropdown tools such as Circle.
|
||||
pub(super) const LARGE_DROPDOWN_ARROW_SIZE: f32 = 9.0;
|
||||
/// Total ribbon tool-area height = 3 × ROW_H + 6 px v-padding + 12 px group-label.
|
||||
pub(super) const TOOL_BAR_H: f32 = 3.0 * ROW_H + 18.0;
|
||||
/// Height of a collapsed panel button's large representative face (big icon +
|
||||
@@ -706,7 +708,7 @@ pub(super) fn render_large_dropdown<'a>(
|
||||
});
|
||||
|
||||
let arr_btn = button(
|
||||
container(icons::themed_arrow_down(9.0))
|
||||
container(icons::themed_arrow_down(LARGE_DROPDOWN_ARROW_SIZE))
|
||||
.width(Fill)
|
||||
.height(Fill)
|
||||
.align_x(iced::Center)
|
||||
|
||||
Reference in new issue
Block a user