## 1. 新增 UiComponent 顶层组件协议(不是负优化)
Components/Shared/Inc/UiComponent.hpp:纯接口、无状态,8 个方法
SetScale / Layout / Area / Paint / HitTest / OnMouseLeave / IsEditing / QueryCursor。
Toolbar / TabBar / SignalPanel / PlotView 本来就各自拥有完全同名同签名的成员,
因此改造 = 加 override + 补 Area()(PlotView 另加一个非 const 的 QueryCursor 转发,
因为它自己的查询会惰性建立行缓存),实现代码零改动、静态派发、体积无增长。
刻意不把 UiWidget 当作它的基类:UiWidget 是"树节点"(父给尺寸、父下探脏区、
命中沿树链派发),而 PlotView(4 层位图缓存)/ SignalPanel(行位图缓存)是
"地盘宿主"。强行上树会推翻"父脏则子全脏"的前提,历史上正是这类耦合导致过
"后台渲染覆盖平移结果""命中矩形错位"的事故。头文件里已写明这条理由。
Toolbar/TabBar 是两者的交集:对外实现 UiComponent,对内持有一棵 UiWidget 树。
## 2. 宿主侧:四条手写链 -> 组件表
Application 新增 ComponentEntry{ component, target, chrome } 与 m_components
(底->顶:plot -> panel -> toolbar -> tabBar),BuildComponentTable() 装配一次。
- ApplyDpi 6 行逐个 SetScale -> 1 个循环
- Relayout 手算三列 x 坐标 -> UiStackRects(内容区, HORIZONTAL, {panelW, splitW, AUTO})
- WM_MOUSELEAVE 逐个 OnMouseLeave -> 循环累积 chromeChanged / plotChanged
- WM_SETCURSOR if/else if 链 -> 从表尾向前找首个命中者,取其 QueryCursor
顺带兑现历史缺口:UiLayout::UiStackRects 自引入以来第一次有了生产调用点。
有意保留显式的三条链(WM_LBUTTONDOWN / WM_LBUTTONUP / WM_MOUSEMOVE):它们各自带
组件专属后置动作(提交重命名、构建派生信号、面板联动滚动、更新拖拽光标、
plotOnlyMove 决定局部失效还是整帧失效)。塞进表里只能靠 lambda 字段,
可读性反而下降 —— 属于用户明确禁止的"过度抽象",因此不做。
## 3. 大文件按职责拆分(纯整函数搬移,逐像素 0 差异)
SignalPanelInteraction.cpp 2329 -> 831 行,拆出:
SignalPanelEdit.cpp 616 内联编辑(筛选框、组名/信号名、数值、颜色与透明度)
SignalPanelScroll.cpp 205 动画与滚动(折起、联动滚动、滚动到目标信号)
SignalPanelMenu.cpp 527 弹出菜单(系数/偏移、镜像、右键菜单与命令回执)
Shared/PopupMenu.cpp 1901 -> 706 行,拆出:
PopupMenuLayout.cpp 753 尺寸测量、项矩形排版、滚动可见性
PopupMenuPaint.cpp 397 背景/阴影/项绘制
Inc/PopupMenuInternal.hpp 103 pmdetail 常量 + inline 辅助(跨 TU 安全)
拆分判据是"职责"而非行数;共享常量一律收敛到 *Internal.hpp。
## 4. 代码审查(修 5 处)
- SignalPanelInteraction.cpp 头注释仍写"4 片",实际 6 片 -> 改为完整清单
- PopupMenuLayout.cpp 机械搬移时把构造函数一起搬走 -> 重复定义,只保留在交互分片
- PopupMenu.cpp 的 #include "PopupMenuInternal.hpp" 落进 namespace jdi 内 -> 移到文件头
- PopupMenuPaint.cpp 缺 UiControls.hpp(UiDrawEditFieldContent 未声明)-> 补 include
- 全仓复查历史删除符号残留引用(m_paintPlot / ClampCursorsAfterPan /
PaintFreeMarkerTooltip / CaptureDecorCache / FitSinglePointSignal / CsvTable /
DataFile / .preflight / structcheck)-> 零命中
## 5. Tools/ 剥离
git rm -r --cached Tools + .gitignore 新增 Tools/(本地文件保留,可随时复跑)。
ui_refactor 分支为全本地分支,另做 filter-branch 清除历史中的该目录。
## 6. 验证
- make release / make debug:零 error 零 warning
- rendercheck:A-H 八个场景哈希与改造前逐一相同
(A 2166933039626F66 B C444ECFEB18FD73D C 7984446D8E7A4418 D BF855879CA12F289
E 1C663E4118616016 F 0535292D8E07AE18 G 7A58172C46577729 H 23F390DD76141113)
FUNC 7/7 PASS
- uicheck:69 passed, 0 failed
- TargetCheck.exe 891,392 B(< 900 KB 阈值)
## 7. 文档
Documents/UI_Refactor_Plan.md / UI_Refactor_Progress.md / UI_Refactor_Report.md
新增第五阶段章节;Documents/agent_mem.md 同步变更日志与「第七轮」硬约束。
708 lines
17 KiB
C++
708 lines
17 KiB
C++
#include "PopupMenu.hpp"
|
|
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
|
|
#include "PopupMenuInternal.hpp"
|
|
#include "UiControls.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;
|
|
}
|
|
|
|
|
|
} // namespace jdi
|