## 1. 边界描边按元素尺寸自适应(修复"小元素变成粗描边")
旧规则四角固定 3-4px:对 15px 的复选框来说包角占短边 20%,看起来就是一整圈粗边框。
新规则全部以**短边**为基准:
- 四边固定 1 设备像素;
- 包角粗细 = min(基础 4/3, 短边/10),再夹到 [1, 短边/4];
- 包角长度 = min(14, 短边/3),且不小于包角粗细;
- 短边 <= 12 只画四个 L 形角标记、**不画边**(一圈连续描边会让小方框显得"被框住");
- 短边 <= 5 完全不画(再画就盖住元素本身);
- 内缩只用于「层级 > 0 且短边 >= 10」,否则小元素会被缩没。
同时**删除文字标签**(含 UiDebugPaintStyle):黑底白字在小元素上必糊成一片,体积也省约 1.5KB。
## 2. 拖网格滚动条时的"大量绘制残留":三个独立成因
R1. PlotView::CollectDebugBoxes 读了 m_decorRects —— 那是**装饰层位图缓存**的登记矩形,
坐标处在位图/图层坐标系(带负 Y、超出绘图区),于是出现 (472,-27 1213x101) 这类
**横跨工具栏的幽灵巨框**。改为只用 LaneBadgeRect 与 m_legendHits(屏幕坐标)。
R2. Paint 的三条快路径(静态场景贴图 / 宽基底贴图 / 样式补丁)只重画**变化的部分**,
而调试边框是画在整个窗口上的叠加内容 ⇒ 上一帧的边框残留在未被重画的像素上,
直到松开鼠标走整幅重绘才消失。
新增 PlotView::SetForceFullRepaint(bool):开启调试叠加层时禁用全部快路径。
R3. 组件内元素可能落在自己地盘之外(滚出可视区的 lane.rect 的 Y 为负),不裁剪就画到
工具栏/标签栏上。box 增加 clip:宿主按组件 Area() 设置,Add() 跳过无交集、
绘制时与 clip 求交。
另外把 Render 的 fullChrome 并入 m_showLayoutBounds,装饰区也保证完整一帧。
## 3. 层级:排序 + 挖洞(修复二级菜单被下层边界覆盖)
- UiDebugBoxList::PushLayer() + 按 (layer, depth) 稳定排序:后收集的内容压住先收集的。
- 但仅靠排序不够:调试线画在所有内容之后,下层组件的线仍会显示在不透明菜单上面。
新增 AddOccluder():菜单/拾色器把本体登记为遮挡矩形,绘制**更低层**的 box 时用
Region::Exclude 挖洞。实测菜单区与子菜单区的琥珀/绿色像素均为 0。
- 浮层**不设** clip = 本体矩形:二级子菜单会展开到本体之外,设裁剪会把它整个裁掉。
## 4. 验证
- make release / make debug 零 error 零 warning;TargetCheck.exe 906,752 B(885.5 KiB < 900 KiB)。
- 新增 .preflight/lbresid(MF4-Record.MF4 / 283 网格 / 拖滚动条)**5/5**:
toolbar-unchanged-while-scrolling、repaint-same-state-is-identical、
toolbar-restored-by-full-repaint、residual-never-above-plot-area、later-layer-wins-over-earlier。
- 新增 .preflight/lbzorder **4/4**:菜单与二级子菜单区内下层颜色像素 = 0。
- 回归:.preflight/lbcheck 21/21、Tools/uicheck 69/69、
Tools/rendercheck「工具栏带以下」区域哈希 8/8 与上一轮逐一相同 + FUNC 7/7。
注:判断"是否有绘制残留"不能用"拖拽帧 vs 松开后一帧"——两者图层预热进度不同会产生
几十万像素的**合法**差异;正确判据是**同一状态连续两帧必须逐像素相同**。
## 5. 文档
Documents/UI_Refactor_Plan.md / UI_Refactor_Progress.md / UI_Refactor_Report.md 追加第八阶段;
Documents/agent_mem.md 同步变更日志与「2026-10-28 第十轮」硬约束与踩坑。
745 lines
18 KiB
C++
745 lines
18 KiB
C++
#include "PopupMenu.hpp"
|
|
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
|
|
#include "PopupMenuInternal.hpp"
|
|
#include "UiControls.hpp"
|
|
#include "UiDebugBounds.hpp"
|
|
#include "UiLayout.hpp"
|
|
|
|
namespace jdi
|
|
{
|
|
PopupMenu::PopupMenu() = default;
|
|
|
|
|
|
bool PopupMenu::OnEditMouseDown(int x, int y)
|
|
{
|
|
if (m_editIndex < 0)
|
|
{
|
|
return false;
|
|
}
|
|
return UiEditFieldMouseDown(m_fonts->uiSmall, EditFieldRect(m_editIndex), m_edit, m_scale, x, y);
|
|
}
|
|
|
|
bool PopupMenu::OnEditMouseMove(int x)
|
|
{
|
|
if (m_editIndex < 0)
|
|
{
|
|
return false;
|
|
}
|
|
return UiEditFieldMouseMove(m_fonts->uiSmall, EditFieldRect(m_editIndex), m_edit, m_scale, x);
|
|
}
|
|
|
|
bool PopupMenu::OnEditMouseUp()
|
|
{
|
|
if (!m_edit.Dragging())
|
|
{
|
|
return false;
|
|
}
|
|
m_edit.EndDrag();
|
|
return true;
|
|
}
|
|
|
|
bool PopupMenu::OnChar(wchar_t character, MenuResult& result)
|
|
{
|
|
result = MenuResult();
|
|
if (m_editIndex < 0)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// 剪贴板与全选快捷键经 WM_CHAR 送达(Ctrl+C/X/V/A 分别对应 3/24/22/1)。
|
|
switch (character)
|
|
{
|
|
case 0x03: // Ctrl+C
|
|
m_edit.CopyToClipboard(m_host);
|
|
return false;
|
|
case 0x18: // Ctrl+X
|
|
return m_edit.CutToClipboard(m_host);
|
|
case 0x16: // Ctrl+V
|
|
return m_edit.PasteFromClipboard(m_host);
|
|
case 0x01: // Ctrl+A
|
|
m_edit.SelectAll();
|
|
return true;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
if (character == L'\r' || character == L'\n')
|
|
{
|
|
// 回车提交:菜单保持打开,仅把新数值回传宿主。
|
|
EndItemEdit(true, result);
|
|
return true;
|
|
}
|
|
// 退格/删除已由 WM_KEYDOWN 处理,此处忽略控制字符避免重复删除。
|
|
if (character < 0x20 || character == 0x7F)
|
|
{
|
|
return false;
|
|
}
|
|
return m_edit.Insert(character);
|
|
}
|
|
|
|
void PopupMenu::Open(MenuScope scope, const gd::RectF& bounds, int x, int y,
|
|
const std::vector<MenuItem>& items, bool expandUp,
|
|
const MenuLayoutConstraint& constraint)
|
|
{
|
|
m_items = items;
|
|
if (m_items.empty())
|
|
{
|
|
Close();
|
|
return;
|
|
}
|
|
|
|
m_scope = scope;
|
|
m_open = true;
|
|
m_hoverIndex = -1;
|
|
m_hoverIconIndex = -1;
|
|
m_hoverSwatch = -1;
|
|
m_pressedIndex = -1;
|
|
m_pressedSwatch = -1;
|
|
m_buildBounds = bounds;
|
|
m_buildX = x;
|
|
m_buildY = y;
|
|
m_buildExpandUp = expandUp;
|
|
// 每次打开都从顶部开始(滚动位置不跨次沿用)。
|
|
m_constraint = constraint;
|
|
m_scrollOffset = 0.0f;
|
|
m_scrollBarDragging = false;
|
|
|
|
CloseSubmenu();
|
|
CloseEditState();
|
|
BuildLayout(bounds, x, y, expandUp);
|
|
}
|
|
|
|
void PopupMenu::Close()
|
|
{
|
|
m_open = false;
|
|
m_scope = MenuScope::NONE;
|
|
m_items.clear();
|
|
m_itemRects.clear();
|
|
m_swatchRects.clear();
|
|
m_hoverIndex = -1;
|
|
m_hoverIconIndex = -1;
|
|
m_hoverSwatch = -1;
|
|
m_pressedIndex = -1;
|
|
m_pressedSwatch = -1;
|
|
m_constraint = MenuLayoutConstraint();
|
|
m_scrollFirst = 0;
|
|
m_pinnedIndex = -1;
|
|
m_scrollEnabled = false;
|
|
m_scrollOffset = 0.0f;
|
|
m_scrollRegionHeight = 0.0f;
|
|
m_scrollViewport = gd::RectF();
|
|
m_scrollBarRect = gd::RectF();
|
|
m_scrollBarDragging = false;
|
|
m_scrollBarGrabOffset = 0.0f;
|
|
CloseSubmenu();
|
|
CloseEditState();
|
|
}
|
|
|
|
void PopupMenu::CloseEditState()
|
|
{
|
|
if (m_editIndex >= 0)
|
|
{
|
|
m_edit.End();
|
|
}
|
|
m_editIndex = -1;
|
|
}
|
|
|
|
bool PopupMenu::ContainsPoint(int x, int y) const
|
|
{
|
|
if (!m_open)
|
|
{
|
|
return false;
|
|
}
|
|
const float fx = static_cast<float>(x);
|
|
const float fy = static_cast<float>(y);
|
|
if (UiPointInRect(m_rect, fx, fy))
|
|
{
|
|
return true;
|
|
}
|
|
// 展开的二级子菜单同样属于菜单范围(否则在子菜单内点击会被当成“点菜单外”)。
|
|
return m_subOpen && UiPointInRect(m_subRect, fx, fy);
|
|
}
|
|
|
|
int PopupMenu::ItemAtPoint(int x, int y, int& swatchIndex) const
|
|
{
|
|
swatchIndex = -1;
|
|
if (!m_open)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
const float fx = static_cast<float>(x);
|
|
const float fy = static_cast<float>(y);
|
|
|
|
for (std::size_t index = 0; index < m_items.size(); ++index)
|
|
{
|
|
const MenuItem& item = m_items[index];
|
|
if (item.kind == MenuItemKind::SEPARATOR || item.kind == MenuItemKind::HEADER)
|
|
{
|
|
continue;
|
|
}
|
|
if (!UiPointInRect(m_itemRects[index], fx, fy))
|
|
{
|
|
continue;
|
|
}
|
|
// 可滚动菜单:滚动区内的条目还必须落在**滚动视口**内 ——
|
|
// 夹在视口边界上、只有一部分可见的条目,只有落在视口内的那一部分可以点击。
|
|
// ⚠️ 前导标题与末尾固定项不在滚动区内,它们始终完整可见(不参与本判定)。
|
|
if (m_scrollEnabled && static_cast<int>(index) >= m_scrollFirst &&
|
|
static_cast<int>(index) < m_pinnedIndex && !UiPointInRect(m_scrollViewport, fx, fy))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (item.kind == MenuItemKind::SWATCHES)
|
|
{
|
|
const std::vector<gd::RectF>& rects = m_swatchRects[index];
|
|
for (std::size_t swatch = 0; swatch < rects.size(); ++swatch)
|
|
{
|
|
if (UiPointInRect(rects[swatch], fx, fy))
|
|
{
|
|
swatchIndex = static_cast<int>(swatch);
|
|
return static_cast<int>(index);
|
|
}
|
|
}
|
|
// 落在色块行的空白处:整行视为可点击,用于定位提示。
|
|
return -1;
|
|
}
|
|
|
|
if (!item.enabled)
|
|
{
|
|
return -1;
|
|
}
|
|
return static_cast<int>(index);
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
void PopupMenu::MoveHover(int step)
|
|
{
|
|
if (m_items.empty())
|
|
{
|
|
return;
|
|
}
|
|
|
|
const int count = static_cast<int>(m_items.size());
|
|
int index = m_hoverIndex;
|
|
for (int attempt = 0; attempt < count; ++attempt)
|
|
{
|
|
index += step;
|
|
if (index < 0)
|
|
{
|
|
index = count - 1;
|
|
}
|
|
else if (index >= count)
|
|
{
|
|
index = 0;
|
|
}
|
|
|
|
const MenuItem& item = m_items[static_cast<std::size_t>(index)];
|
|
if ((item.kind == MenuItemKind::NORMAL || item.kind == MenuItemKind::EDIT) && item.enabled)
|
|
{
|
|
m_hoverIndex = index;
|
|
m_hoverSwatch = -1;
|
|
// 键盘移动时把目标条目滚入可视区(长菜单里按方向键不能“跳到看不见的条目”)。
|
|
EnsureItemVisible(index);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
bool PopupMenu::CommitHover(MenuResult& result)
|
|
{
|
|
if (m_hoverIndex < 0 || m_hoverIndex >= static_cast<int>(m_items.size()))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
const MenuItem& item = m_items[static_cast<std::size_t>(m_hoverIndex)];
|
|
if (!item.enabled)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// 编辑项:回车等价于单击进入编辑,菜单不关闭。
|
|
if (item.kind == MenuItemKind::EDIT)
|
|
{
|
|
BeginItemEdit(m_hoverIndex);
|
|
return false;
|
|
}
|
|
if (item.kind != MenuItemKind::NORMAL)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
result.valid = true;
|
|
result.scope = m_scope;
|
|
result.id = item.id;
|
|
result.swatchIndex = -1;
|
|
result.itemRect = m_itemRects[static_cast<std::size_t>(m_hoverIndex)];
|
|
return true;
|
|
}
|
|
|
|
bool PopupMenu::OnMouseMove(int x, int y)
|
|
{
|
|
if (!m_open)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
const float fx = static_cast<float>(x);
|
|
const float fy = static_cast<float>(y);
|
|
bool changed = false;
|
|
|
|
// 正在拖拽滚动条滑块:忽略悬停,只跟随鼠标滚动条目区。
|
|
if (m_scrollBarDragging)
|
|
{
|
|
const float previous = m_scrollOffset;
|
|
m_scrollOffset = ScrollOffsetForThumbTop(fy - m_scrollBarGrabOffset);
|
|
RebuildLayout();
|
|
return std::fabs(m_scrollOffset - previous) > 0.01f;
|
|
}
|
|
|
|
// 鼠标在展开的子菜单内:只更新子菜单的悬停项(主菜单父项保持高亮)。
|
|
if (m_subOpen && UiPointInRect(m_subRect, fx, fy))
|
|
{
|
|
const int sub = SubItemAtPoint(x, y);
|
|
if (sub != m_subHoverIndex)
|
|
{
|
|
m_subHoverIndex = sub;
|
|
changed = true;
|
|
}
|
|
return changed;
|
|
}
|
|
|
|
int swatchIndex = -1;
|
|
const int index = ItemAtPoint(x, y, swatchIndex);
|
|
const bool onSubmenuParent =
|
|
(index >= 0) && (m_items[static_cast<std::size_t>(index)].kind == MenuItemKind::SUBMENU);
|
|
|
|
// 子菜单展开期间,鼠标只要仍停留在「主菜单 ∪ 子菜单」的范围内且尚未落到其它可点击
|
|
// 条目上(例如掠过父项右缘与子菜单之间的内边距窄带、分隔线或禁用项),就不收起子菜单。
|
|
// 这样可避免处理器速度较快、鼠标移动事件过密时,用户还没把指针移到子菜单上,
|
|
// 子菜单就被中途误关闭;只有明确移到其它条目或完全离开该范围时才收起。
|
|
if (m_subOpen && !onSubmenuParent && index < 0 &&
|
|
(UiPointInRect(m_rect, fx, fy) || UiPointInRect(m_subRect, fx, fy)))
|
|
{
|
|
// 保持在父项高亮,视觉上指明子菜单的来源。
|
|
if (m_hoverIndex != m_subParentIndex || m_hoverSwatch != -1)
|
|
{
|
|
m_hoverIndex = m_subParentIndex;
|
|
m_hoverSwatch = -1;
|
|
changed = true;
|
|
}
|
|
return changed;
|
|
}
|
|
|
|
if (index != m_hoverIndex || swatchIndex != m_hoverSwatch)
|
|
{
|
|
m_hoverIndex = index;
|
|
m_hoverSwatch = swatchIndex;
|
|
changed = true;
|
|
}
|
|
|
|
// `HEADER_ACTION` 的图标按钮单独跟踪悬停状态(用于高亮,其余标题区域不响应)。
|
|
{
|
|
int iconHover = -1;
|
|
for (std::size_t itemIndex = 0; itemIndex < m_items.size(); ++itemIndex)
|
|
{
|
|
if (m_items[itemIndex].kind != MenuItemKind::HEADER_ACTION)
|
|
{
|
|
continue;
|
|
}
|
|
const gd::RectF icon = HeaderIconRect(static_cast<int>(itemIndex));
|
|
if (icon.Width > 0.0f && UiPointInRect(icon, fx, fy))
|
|
{
|
|
iconHover = static_cast<int>(itemIndex);
|
|
break;
|
|
}
|
|
}
|
|
if (iconHover != m_hoverIconIndex)
|
|
{
|
|
m_hoverIconIndex = iconHover;
|
|
changed = true;
|
|
}
|
|
}
|
|
|
|
// 悬停到带子菜单的项 → 向右展开;移开到其它条目或离开菜单 → 收起。
|
|
if (onSubmenuParent)
|
|
{
|
|
if (!m_subOpen || m_subParentIndex != index)
|
|
{
|
|
BuildSubLayout(index);
|
|
changed = true;
|
|
}
|
|
}
|
|
else if (m_subOpen)
|
|
{
|
|
CloseSubmenu();
|
|
changed = true;
|
|
}
|
|
return changed;
|
|
}
|
|
|
|
bool PopupMenu::OnLButtonDown(int x, int y, MenuResult& result)
|
|
{
|
|
result = MenuResult();
|
|
if (!m_open)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
if (!ContainsPoint(x, y))
|
|
{
|
|
// 点击菜单外部:先提交正在编辑的数值,再关闭菜单。
|
|
EndItemEdit(true, result);
|
|
Close();
|
|
return true;
|
|
}
|
|
|
|
// 子菜单内的按下:记录待确认项,待抬起时提交。
|
|
if (m_subOpen && UiPointInRect(m_subRect, static_cast<float>(x), static_cast<float>(y)))
|
|
{
|
|
m_subPressedIndex = SubItemAtPoint(x, y);
|
|
m_pressedIndex = -1;
|
|
m_pressedSwatch = -1;
|
|
return true;
|
|
}
|
|
|
|
// 已经处于编辑状态时:点击当前输入框 → 重新定位插入符;
|
|
// 点击其它位置 → 先提交本次编辑(菜单不关闭),再按新位置继续处理。
|
|
if (m_editIndex >= 0)
|
|
{
|
|
if (IsOnEditField(x, y))
|
|
{
|
|
OnEditMouseDown(x, y);
|
|
m_pressedIndex = m_editIndex;
|
|
m_pressedSwatch = -1;
|
|
return true;
|
|
}
|
|
EndItemEdit(true, result);
|
|
}
|
|
|
|
// 可滚动菜单的滚动条:按下即开始拖拽(不是条目点击,菜单保持打开)。
|
|
if (m_scrollEnabled)
|
|
{
|
|
const gd::RectF thumb = ScrollBarThumbRect();
|
|
if (thumb.Width > 0.0f && UiPointInRect(thumb, static_cast<float>(x), static_cast<float>(y)))
|
|
{
|
|
// 抓住滑块:记录抓取偏移,拖动时按“指针 − 偏移”重算偏移量。
|
|
m_scrollBarDragging = true;
|
|
m_scrollBarGrabOffset = static_cast<float>(y) - thumb.Y;
|
|
m_pressedIndex = -1;
|
|
m_pressedSwatch = -1;
|
|
RebuildLayout();
|
|
return true;
|
|
}
|
|
if (UiPointInRect(m_scrollBarRect, static_cast<float>(x), static_cast<float>(y)))
|
|
{
|
|
// 点在轨道空白处:把滑块中心移到该处(翻页)。
|
|
m_scrollBarDragging = true;
|
|
m_scrollBarGrabOffset = thumb.Height * 0.5f;
|
|
m_scrollOffset = ScrollOffsetForThumbTop(static_cast<float>(y) - m_scrollBarGrabOffset);
|
|
m_pressedIndex = -1;
|
|
m_pressedSwatch = -1;
|
|
RebuildLayout();
|
|
return true;
|
|
}
|
|
}
|
|
|
|
int swatchIndex = -1;
|
|
m_pressedIndex = ItemAtPoint(x, y, swatchIndex);
|
|
m_pressedSwatch = swatchIndex;
|
|
return true;
|
|
}
|
|
|
|
bool PopupMenu::OnLButtonUp(int x, int y, MenuResult& result)
|
|
{
|
|
// 每次抬起都重新构造结果(编辑提交已在 `OnLButtonDown` 里通过 `EndItemEdit` 下发,
|
|
// 这里不需要保留进入时的旧结果)。
|
|
result = MenuResult();
|
|
if (!m_open)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// 结束滚动条拖拽(不当作条目点击,菜单保持打开)。
|
|
if (m_scrollBarDragging)
|
|
{
|
|
m_scrollBarDragging = false;
|
|
m_pressedIndex = -1;
|
|
m_pressedSwatch = -1;
|
|
return true;
|
|
}
|
|
|
|
// 子菜单内的抬起:按下与抬起命中同一项才提交(菜单随之关闭)。
|
|
if (m_subOpen && m_subPressedIndex >= 0)
|
|
{
|
|
const int subPressed = m_subPressedIndex;
|
|
m_subPressedIndex = -1;
|
|
if (UiPointInRect(m_subRect, static_cast<float>(x), static_cast<float>(y)) &&
|
|
SubItemAtPoint(x, y) == subPressed)
|
|
{
|
|
const MenuItem& item = m_subItems[static_cast<std::size_t>(subPressed)];
|
|
if (item.kind == MenuItemKind::NORMAL || item.kind == MenuItemKind::SWATCHES)
|
|
{
|
|
result.valid = true;
|
|
result.scope = m_scope;
|
|
result.id = item.id;
|
|
result.swatchIndex = -1;
|
|
result.itemRect = m_subItemRects[static_cast<std::size_t>(subPressed)];
|
|
Close();
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
// 编辑态下松开:先结束拖拽框选,不当作普通项点击。
|
|
if (m_editIndex >= 0)
|
|
{
|
|
OnEditMouseUp();
|
|
m_pressedIndex = -1;
|
|
m_pressedSwatch = -1;
|
|
return true;
|
|
}
|
|
|
|
int swatchIndex = -1;
|
|
const int index = ItemAtPoint(x, y, swatchIndex);
|
|
const int pressedIndex = m_pressedIndex;
|
|
const int pressedSwatch = m_pressedSwatch;
|
|
m_pressedIndex = -1;
|
|
m_pressedSwatch = -1;
|
|
|
|
// 在菜单之外释放鼠标时视为取消操作。
|
|
if (!ContainsPoint(x, y))
|
|
{
|
|
Close();
|
|
return true;
|
|
}
|
|
|
|
if (index < 0 || index != pressedIndex)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
const MenuItem& item = m_items[static_cast<std::size_t>(index)];
|
|
|
|
// 子菜单父项:单击不下发命令,只保证子菜单处于展开状态。
|
|
if (item.kind == MenuItemKind::SUBMENU)
|
|
{
|
|
if (!m_subOpen || m_subParentIndex != index)
|
|
{
|
|
BuildSubLayout(index);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
// `HEADER_ACTION`:只有**点在右侧图标按钮上**才下发命令(标题区域不响应);
|
|
// 菜单保持打开(这是一个可反复使用的小按钮,如「还原系数」)。
|
|
if (item.kind == MenuItemKind::HEADER_ACTION)
|
|
{
|
|
const gd::RectF icon = HeaderIconRect(index);
|
|
if (icon.Width > 0.0f && UiPointInRect(icon, static_cast<float>(x), static_cast<float>(y)))
|
|
{
|
|
result.valid = true;
|
|
result.scope = m_scope;
|
|
result.id = item.id;
|
|
result.swatchIndex = -1;
|
|
result.itemRect = icon;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
// 编辑项:单击进入菜单内联编辑,菜单保持打开。
|
|
if (item.kind == MenuItemKind::EDIT)
|
|
{
|
|
BeginItemEdit(index);
|
|
return true;
|
|
}
|
|
|
|
result.valid = true;
|
|
result.scope = m_scope;
|
|
result.id = item.id;
|
|
result.swatchIndex = -1;
|
|
result.itemRect = m_itemRects[static_cast<std::size_t>(index)];
|
|
|
|
if (item.kind == MenuItemKind::SWATCHES)
|
|
{
|
|
if (swatchIndex < 0 || swatchIndex != pressedSwatch)
|
|
{
|
|
result.valid = false;
|
|
return true;
|
|
}
|
|
result.swatchIndex = swatchIndex;
|
|
}
|
|
|
|
// 带复选框的切换项(如镜像的水平/垂直)选择后**保持菜单打开**,便于连续勾选。
|
|
if (item.keepOpen)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
Close();
|
|
return true;
|
|
}
|
|
|
|
bool PopupMenu::OnKeyDown(WPARAM key, MenuResult& result)
|
|
{
|
|
result = MenuResult();
|
|
if (!m_open)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// 编辑态下按键全部交给输入框(回车提交、Esc 取消本次编辑但菜单保持打开)。
|
|
if (m_editIndex >= 0)
|
|
{ const bool shift = (GetKeyState(VK_SHIFT) & 0x8000) != 0;
|
|
switch (key)
|
|
{
|
|
case VK_ESCAPE:
|
|
EndItemEdit(false, result);
|
|
return true;
|
|
case VK_RETURN:
|
|
EndItemEdit(true, result);
|
|
return true;
|
|
case VK_BACK:
|
|
m_edit.Backspace();
|
|
return true;
|
|
case VK_DELETE:
|
|
m_edit.DeleteForward();
|
|
return true;
|
|
case VK_LEFT:
|
|
m_edit.MoveCaret(-1, shift);
|
|
return true;
|
|
case VK_RIGHT:
|
|
m_edit.MoveCaret(1, shift);
|
|
return true;
|
|
case VK_HOME:
|
|
m_edit.MoveHome(shift);
|
|
return true;
|
|
case VK_END:
|
|
m_edit.MoveEnd(shift);
|
|
return true;
|
|
default:
|
|
break;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
switch (key)
|
|
{
|
|
case VK_ESCAPE:
|
|
// Esc 先收起展开的二级子菜单,再次按下才关闭整个菜单。
|
|
if (m_subOpen)
|
|
{
|
|
CloseSubmenu();
|
|
return true;
|
|
}
|
|
Close();
|
|
return true;
|
|
case VK_LEFT:
|
|
if (m_subOpen)
|
|
{
|
|
CloseSubmenu();
|
|
return true;
|
|
}
|
|
break;
|
|
case VK_RIGHT:
|
|
{
|
|
if (m_hoverIndex >= 0 &&
|
|
m_items[static_cast<std::size_t>(m_hoverIndex)].kind == MenuItemKind::SUBMENU)
|
|
{
|
|
BuildSubLayout(m_hoverIndex);
|
|
return true;
|
|
}
|
|
break;
|
|
}
|
|
case VK_DOWN:
|
|
if (m_subOpen && m_subItems.size() > 0)
|
|
{
|
|
const int count = static_cast<int>(m_subItems.size());
|
|
m_subHoverIndex = (m_subHoverIndex + 1 + count) % count;
|
|
return true;
|
|
}
|
|
MoveHover(1);
|
|
return true;
|
|
case VK_UP:
|
|
if (m_subOpen && m_subItems.size() > 0)
|
|
{
|
|
const int count = static_cast<int>(m_subItems.size());
|
|
m_subHoverIndex = (m_subHoverIndex - 1 + count) % count;
|
|
return true;
|
|
}
|
|
MoveHover(-1);
|
|
return true;
|
|
case VK_RETURN:
|
|
{
|
|
// 子菜单展开且已有悬停项时,回车提交该项。
|
|
if (m_subOpen && m_subHoverIndex >= 0 &&
|
|
m_subHoverIndex < static_cast<int>(m_subItems.size()))
|
|
{
|
|
const MenuItem& item = m_subItems[static_cast<std::size_t>(m_subHoverIndex)];
|
|
if (item.kind == MenuItemKind::NORMAL && item.enabled)
|
|
{
|
|
result.valid = true;
|
|
result.scope = m_scope;
|
|
result.id = item.id;
|
|
result.swatchIndex = -1;
|
|
result.itemRect = m_subItemRects[static_cast<std::size_t>(m_subHoverIndex)];
|
|
Close();
|
|
}
|
|
return true;
|
|
}
|
|
if (CommitHover(result))
|
|
{
|
|
Close();
|
|
}
|
|
return true;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
|
|
void PopupMenu::CollectDebugBoxes(UiDebugBoxList& boxes) const
|
|
{
|
|
if (!m_open)
|
|
{
|
|
return;
|
|
}
|
|
|
|
// 层级 0:菜单浮层整体。
|
|
boxes.Add(m_rect, 0);
|
|
// 菜单是不透明浮层 ⇒ 登记为遮挡矩形:下层组件(面板行 / 网格)的边框线不再画到它上面。
|
|
boxes.AddOccluder(m_rect);
|
|
|
|
// 层级 1:每个条目(含标题 / 分隔线 / 色块行,它们的矩形都已算好)。
|
|
for (const gd::RectF& item : m_itemRects)
|
|
{
|
|
boxes.Add(item, 1);
|
|
}
|
|
|
|
// 层级 1/2:可滚动菜单的可视区、轨道与滑块。
|
|
boxes.Add(m_scrollViewport, 1);
|
|
boxes.Add(m_scrollBarRect, 2);
|
|
boxes.Add(ScrollBarThumbRect(), 2);
|
|
|
|
// 层级 0/1:二级子菜单(**另起一个绘制层**:它压在菜单项之上)。
|
|
if (UiRectHasArea(m_subRect))
|
|
{
|
|
boxes.PushLayer();
|
|
boxes.Add(m_subRect, 0);
|
|
boxes.AddOccluder(m_subRect);
|
|
for (const gd::RectF& item : m_subItemRects)
|
|
{
|
|
boxes.Add(item, 1);
|
|
}
|
|
}
|
|
}
|
|
} // namespace jdi
|