## 为什么
用户 2026-10-29 要求:按既定计划完整实现改进,但
① **不得把编译产物拆成 DLL**(项目定位是单文件轻量工具,最终只能有一个 .exe);
② 异常处理改用**预检验**而不是 try/catch(-fno-exceptions 省体积,且 try/catch 本身开销大);
③ 先删除 Documents 内三份 UI 重构文档再按"计划 / 当前进度 / 最终报告"重建;
④ 顺便审计代码,删除无用/过时注释,修复名实不符;
⑤ 提交到本地仓库,期间不要占用用户的鼠标/键盘/屏幕。
## 改了什么
### 1. 体积(909,824 B -> 788,992 B,-120,832 B,-13.3%)
Makefile 新增三个可覆盖开关(默认全为 1):
- `LAYOUT_BOUNDS` 编入/剔除「显示布局边界」叠加层
- `NO_EXCEPTIONS` 追加 `-fno-exceptions`
- `LTO` 追加 `-flto`(编译 + 链接)
派生:`FUNC_SECTIONS`(LTO 下为空)、`GC_SECTIONS`(`-Wl,--gc-sections`)、
`ASM_LISTING`/`ASM_LISTING_C`(LTO 下为空,因为 lto-wrapper 会丢弃 `-Wa` 清单)。
两个实测复现的坑(已写进 Makefile 注释):
- **切换 LTO 必须 `make clean`**:LTO 与非 LTO 目标文件混链会让 GCC 15.2.0 在
`binds_to_current_def_p (symtab.cc:2598)` 处 ICE。
- **`-flto` 与 `-ffunction-sections -fdata-sections` 同时打开也 ICE**(干净重编也必崩,
报错落点是 `DataModel.hpp:393`,但那是 COMDAT 解析落点、不是原因)⇒
LTO 下 `FUNC_SECTIONS` 置空,并加 `-flto-partition=one`:默认 11 个分区的 LTRANS
稳定复现,单分区从未复现。**这是稳定性选项,不是性能选项。**
### 2. 关异常必须成对交付:预检验 + 兜底
新增 `Utilities/Inc/MemProbe.hpp` + `Utilities/Src/MemProbe.cpp`:
- `MemAvailablePhysical()`:`GlobalMemoryStatusEx` + 200ms 缓存
- `MemCanAllocate(bytes)`:预留后仍须保有 1/8 可用内存
- `MemReserveIfRoom(container, n)`:含 `capacity()` 早退与乘法溢出保护
- `MemInstallTerminateHandler()`:OOM 时弹一次带建议的模态提示后 `_Exit`(而不是静默消失)
接入:
- `Utilities/Src/DataModel.cpp`:全仓**唯一**的 `try/catch`(`extremes.reserve` 捕
`std::bad_alloc`)改为 `MemReserveIfRoom(extremes, count / 8)`
- `Components/PlotView/Src/PlotView.cpp`:`AvailablePhysicalBytes()` 原有一份**完整重复**
的 `GlobalMemoryStatusEx` + 缓存实现 → 转发 `MemAvailablePhysical()`
- `Components/Application/Src/Application.cpp`:`Initialize()` 开头安装 terminate handler
### 3. L1 几何产物层
新增 `Components/Shared/Inc/UiBox.hpp` + `Src/UiBox.cpp`:
- `struct UiBox { rect, clip, depth, layer }` —— 纯值类型,不继承任何东西
(继承会和 PlotView 4 层位图缓存 / SignalPanel 行位图缓存的失效体系打架)
- `class UiBoxTable : public UiTextRectSink` —— 只累计几何 + 裁剪/层/遮挡,**不含绘制代码**
`UiComponent::CollectDebugBoxes` → **`virtual void BuildBoxes(UiBoxTable&)`**:
组件从"收集布局边界(调试用)"改为"上报几何产物",不再需要知道"调试"这个概念存在。
`UiDebugBounds.hpp/.cpp` 退化为唯一的消费者(配色 + 包角描边 + 遮挡挖洞)。
除宿主 `ApplicationCommands.cpp` 外,所有组件源码现在只包含 `UiBox.hpp`。
### 4. 审计
- `MemProbe` 里"省 40~60KB"的估算 → 改为实测 27,136 B
- `MemProbe.hpp` 的 `<new>`、`MemProbe.cpp` 的 `<cstdio>`:未使用,删除
- `UiDebugPaintBounds(g, rect, depth)`:零调用者,删除(只保留带 clip 的版本)
- `TabBar`/`Toolbar`/`PlotView`/`SignalPanel` 的 `BuildBoxes` 文档"(调试用)"→"几何 box"
- `PlotView::SetForceFullRepaint` 补写"为什么保留而不优化"
### 5. 文档
`Documents/UI_Refactor_Plan.md` / `_Progress.md` / `_Report.md` 先 `git rm` 再按
「计划 / 当前进度 / 最终报告」重建;`Documents/agent_mem.md` 追加第十三轮记录。
## 怎么验证
```
make clean
make release TARGET_FILE_NAME=JustDataInspector -j16 # 零 error / 零 warning,788,992 B
make debug TARGET_FILE_NAME=JustDataInspectorD -j16 # 零 warning
uicheck 69/69 lbcheck 21/21 lbresid 5/5 lbzorder 4/4 lbcovr 7/7 lbpanel 10/10
rendercheck: 8 个场景哈希与改造前逐一相同 + FUNC 7/7 PASS, exit=0
A FAED59DF284153DB B E6443BFE4E3955F8 C 96A0AA8C402F1729 D E3D5DBD998E43720
E DA0583CB13C26A6F F FFB822159F604D1D G 19F8DE8FE3A8DF18 H DBBDDE4CB2C97C92
```
体积溯源(`objdump -h`,基线 → 最终):
`.text` 735,600 → 657,168;`.rdata` 49,184 → 35,016;
`.xdata` 48,132 → 27,512;`.pdata` 35,424 → 28,524;`.rsrc` 20,656 不变。
## 没做什么(有意为之)
- **没有拆 DLL**(用户明确要求单文件)
- **没有改优化等级**(`-Oz` 保持)
- **L2(`UiDamage` 脏矩形 + 独立叠加层)评估后缓做**:受益方只有"调试开关打开时的帧率",
而正确实现必须把叠加层旧矩形注入底层组件重绘范围,穿透 PlotView 四条快路径 + 两层缓存;
在用户反复报过"拖拽错位 / 贴图残留"的背景下,风险与收益不成比例。理由写在
`Documents/UI_Refactor_Plan.md` §5 与 `PlotView::SetForceFullRepaint` 的文档里。
753 lines
19 KiB
C++
753 lines
19 KiB
C++
#include "PopupMenu.hpp"
|
||
|
||
#include <algorithm>
|
||
#include <cmath>
|
||
|
||
#include "PopupMenuInternal.hpp"
|
||
#include "UiControls.hpp"
|
||
#include "UiBox.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::BuildBoxes(UiBoxTable& boxes) const
|
||
{
|
||
if (!m_open)
|
||
{
|
||
return;
|
||
}
|
||
|
||
// 层级 0:菜单浮层整体。
|
||
boxes.Add(m_rect, 0);
|
||
// 菜单是不透明浮层 ⇒ 登记为遮挡矩形:下层组件(面板行 / 网格)的边框线不再画到它上面。
|
||
boxes.AddOccluder(m_rect);
|
||
|
||
// 层级 1:每个条目(含标题 / 分隔线 / 色块行,它们的矩形都已算好)。
|
||
// ⚠️ **必须裁剪到可视区**:`m_itemRects` 里包含**滚出视口**的条目(它们只是不绘制),
|
||
// 不裁剪会把调试框画到菜单外面 —— 看起来就像"滚动时条目仍然在绘制",
|
||
// 也让菜单的边界看起来"超出了自身"(用户 2026-10-29 报告)。
|
||
boxes.SetClip(m_scrollEnabled ? m_scrollViewport : m_rect);
|
||
for (const gd::RectF& item : m_itemRects)
|
||
{
|
||
boxes.Add(item, 1);
|
||
}
|
||
boxes.SetClip(gd::RectF());
|
||
|
||
// 层级 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);
|
||
// 同理:子菜单条目也必须裁到子菜单自身,否则滚动时同样会"溢出"。
|
||
boxes.SetClip(m_subRect);
|
||
for (const gd::RectF& item : m_subItemRects)
|
||
{
|
||
boxes.Add(item, 1);
|
||
}
|
||
boxes.SetClip(gd::RectF());
|
||
}
|
||
}
|
||
} // namespace jdi
|