DeepSeek V4.1 Flash
739a523af5
## 0. 仓库同步 远端 gitea 已把 UI_Refactor 合入 main（PR #1，合并提交 322b658，分支保留）。 main 与 UI_Refactor 均同步到该提交；dev 分支远端从未存在（意外产物），本地已删除。 ## 1. 修正上一轮的性能误判（重要） 上一轮报告称「PlotView 基线每帧在 WarmLaneLayersStep 上多花约 2.4ms」。本轮用两级计时查证， 该结论是错的： 排空前 idle 2.60 ms ← 含"图层预热队列排空"的瞬时成本 排空后 idle 0.53 ms ← 真正的稳态 强制整帧 idle 0.46 ms 那 2.4ms 是载入 283 个网格后给 16 个网格补建宽基底图层的**瞬时**开销（每帧补 1 个，约 16 帧结束）， 属于设计内的预热，不存在每帧白烧的固定成本。 仍修掉顺带发现的一处顺序问题：RollWideBuffer 原来对全部 283 个网格先算 LaneLayerKey() （逐网格内容哈希 ≈0.7ms/帧）再判断可视性，且离屏网格的"结构不可用"分支会逐帧把它们塞进 待重画队列再被清掉。现在把 LaneVisuallyRelevant 判断提到循环最前面（见函数内注释）。 ## 2. 浮动面板被网格边界穿透（层级 + 挖洞 + 裁剪） 根因：PlotView::CollectDebugBoxes 把网格盒子与面板盒子放在同一绘制层，只靠 depth 排序； 而调试线画在所有内容之后，"后画"只决定谁压谁，不能阻止下层组件的线仍然可见。 修复三步： - 收集面板前 boxes.PushLayer() ⇒ 面板层高于网格层； - 每个面板 boxes.AddOccluder(layout.panel) ⇒ 绘制更低层盒子时用 Region::Exclude 挖洞； - boxes.SetClip(layout.panel) ⇒ 面板内部元素（如滚出内容区的行）不再登记到面板外。 ## 3. 滚动时面板/菜单边界闪烁或溢出 滚动容器里的条目矩形始终存在，只是绘制时被裁剪掉；调试层读到这些矩形就会给"看不见的内容"画框， 滚动时条目不断进出可视区，框也就不断出现/消失 ⇒ 闪烁 / "边界超出菜单"。 - 面板内容裁到 layout.panel； - 菜单条目裁到 m_scrollEnabled ? m_scrollViewport : m_rect；二级子菜单条目裁到 m_subRect。 ## 4. 顺带小优化 EdgePanelLayoutFor 单次约 2~3µs，283 网格 × 5 类 = 1415 次/帧。现在先看该网格的 5 个面板 open 标志，全关就跳过内层循环。 ## 5. 验证 - make release / make debug 零 error 零 warning；TargetCheck.exe 909,824 B（888.5 KiB < 900 KiB）。 - 新增探针 .preflight/lbpanel 10/10： panel-open / panel-contents-clipped-to-panel / panel-registered-as-occluder / no-lane-bounds-inside-panel（面板内网格层颜色像素=0）/ scrolling-actually-happened （真滚动 0.0→1295.1）/ panel-boxes-stable-while-scrolling（11/11 帧签名一致）/ menu-open-scrollable / no-box-escapes-menu / scrolled-out-items-not-collected。 - 回归：lbcovr 7/7、lbzorder 4/4、lbresid 5/5、lbcheck 21/21、uicheck 69/69。 - rendercheck：8 个场景哈希与上一轮**逐一相同** + FUNC 7/7（本轮不应改变任何正常绘制像素）。 ## 6. 文档 Documents/UI_Refactor_Plan.md / UI_Refactor_Progress.md / UI_Refactor_Report.md 追加第十阶段； Documents/agent_mem.md 同步变更日志与「2026-10-29 第十二轮」的结论修正、浮层三件事、踩坑。
753 lines
19 KiB
C++
753 lines
19 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：每个条目（含标题 / 分隔线 / 色块行，它们的矩形都已算好）。
|
||
// ⚠️ **必须裁剪到可视区**：`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
|