DeepSeek V4.1 Flash
dd48cdd2e1
1) 工具栏文案："时间轴缩放"/"Y 轴缩放" -> "时间轴选区"/"Y 轴选区" - Toolbar.cpp 按钮标签、Toolbar.hpp 枚举注释、Application 状态提示语同步更新 2) 网格右键菜单：对勾从左侧移到右侧，并修正菜单内各元素边距 - 文本列统一为 kPadH + kItemPad（5 + 8），三类条目（HEADER/NORMAL/EDIT）共用； 原先左侧预留 22px 标记列，导致"网格 N"、"Y 轴最大值"、"选区 Y 轴自适应"等 所有文本的左边距被整体推右（用户报告的"文本左边距过大"） - 对勾改画在条目右侧的 kMarkerColumn(18) 列内，文本宽度相应预留，不会与文字重叠 - EDIT 行输入框改为右对齐到条目内容区右边界，宽度由 NaturalEditFieldWidth() 统一计算， 空间不足时为左侧说明文字保留自然宽度（避免被菜单宽度上限挤成省略号） - 分隔线、色块行同样改用 kItemPad 内缩；kRightPad 已删除 3) "选区 Y 轴自适应"增加与"Y 轴自适应"一致的勾选标记 - Lane 新增 viewAutoRange / viewAutoMin / viewAutoMax，记录应用该操作时的视图时间区间 - 新增 PlotView::LaneRangeIsAutoToView()：只有未被任何手动幅值改动且时间选区未变化时才为 true - 所有手动改动路径（ApplyValueSelection/ScaleLaneRange/ShiftLaneRange/ApplyLaneValueText/ EndEdit/ResetLaneRange/MoveSignalToLane）都会清除该状态； 时间选区变化后 viewAutoMin/Max 与当前视图不符，勾选自动消失 - RefreshPlotMenuValues() 同步刷新该项状态 4) 修复大文件（VERY_BIG_DATA 1.77GB / 5 信号）下悬停与选区缩放的严重卡顿 - 根因：任何悬停态变化（左侧信号列表、网格内命中曲线提示）或选区拖拽都会触发整幅重绘， 其中波形绘制约 80ms/帧，因此交互帧率只有 ~10fps - 静态场景缓存从"仅拖拽信号/光标"推广为"只要场景键一致就复用"，缓存区域由整个客户区 收敛为仅绘图区：工具栏/标签栏/面板各自带悬停态必须每帧绘制（约 10.5ms）， 而真正昂贵的波形改为直接贴图（约 1ms） - 场景键新增 contentHash（FNV-1a 折叠网格几何/幅值、每条信号的引用/可见性/ 颜色/透明度/线宽/样式/显示名与所属文件名）：改样式、重命名、增删信号都会自动失效 - 随鼠标变化的内容全部移出缓存：新增 PaintHoverHighlight() 在贴图之后绘制 悬停网格底色（半透明叠加）与悬停信号光晕（PaintSignalHalo()）； PaintLane 内只绘制拖拽中的信号光晕（key 中记录 haloFile/haloSignal） - EnsureSceneCache 改为要求位图尺寸与当前区域严格相等（原 >= 复用会在窗口缩小后 把旧像素画到绘图区之外） - Application::Render 移除 reuseScene 分支，统一每帧绘制界面框架 实测（VERY_BIG_DATA 5 信号，Release）： - 整幅重绘 ~80ms -> 命中缓存贴图 ~1ms - 悬停左侧信号列表：~95ms -> ~14ms/帧 - 悬停网格内信号（含光晕高亮）：~95ms -> ~28~32ms/帧 - 时间轴 / Y 轴选区拖拽：~95~105ms -> ~19~22ms/帧 - 非拖拽静止帧 ~118ms 维持不变；空闲 CPU 0.00% 构建: make clean; make all 无警告无错误
877 lines
24 KiB
C++
877 lines
24 KiB
C++
#include "PopupMenu.hpp"
|
|
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
|
|
namespace jdi
|
|
{
|
|
|
|
namespace
|
|
{
|
|
const float kRowHeight = 27.0f; /**< 普通项高度。 */
|
|
const float kHeaderHeight = 22.0f; /**< 分组标题高度。 */
|
|
const float kSeparatorHeight = 9.0f; /**< 分隔线高度。 */
|
|
const float kSwatchRowHeight = 32.0f; /**< 色块行高度。 */
|
|
const float kPadV = 5.0f; /**< 菜单上下内边距。 */
|
|
const float kPadH = 5.0f; /**< 菜单左右内边距。 */
|
|
const float kItemPad = 8.0f; /**< 条目内文本的左右内缩（所有条目统一）。 */
|
|
const float kMarkerColumn = 18.0f; /**< 条目**右侧**的选中标记列宽度（对勾画在这里）。 */
|
|
const float kMarkerGap = 4.0f; /**< 文本与右侧标记列之间的间隔。 */
|
|
const float kMinWidth = 148.0f; /**< 菜单最小宽度。 */
|
|
const float kMaxWidth = 340.0f; /**< 菜单最大宽度。 */
|
|
const float kCorner = 6.0f; /**< 菜单圆角半径。 */
|
|
const float kSwatchSize = 22.0f; /**< 色块尺寸。 */
|
|
const float kSwatchGap = 5.0f; /**< 色块间距。 */
|
|
const float kEditFieldWidth = 88.0f; /**< EDIT 项输入框宽度。 */
|
|
const float kEditFieldGap = 6.0f; /**< 说明文字与输入框之间的最小间隔。 */
|
|
const float kEditFieldPadV = 5.0f; /**< 输入框上下内缩。 */
|
|
}
|
|
|
|
PopupMenu::PopupMenu() = default;
|
|
|
|
void PopupMenu::Setup(const UiFonts* fonts, const Theme* theme)
|
|
{
|
|
m_fonts = fonts;
|
|
m_theme = theme;
|
|
}
|
|
|
|
void PopupMenu::SetScale(float scale)
|
|
{
|
|
m_scale = (scale > 0.1f) ? scale : 1.0f;
|
|
}
|
|
|
|
float PopupMenu::ItemHeight(const MenuItem& item) const
|
|
{
|
|
switch (item.kind)
|
|
{
|
|
case MenuItemKind::SEPARATOR:
|
|
return kSeparatorHeight * m_scale;
|
|
case MenuItemKind::HEADER:
|
|
return kHeaderHeight * m_scale;
|
|
case MenuItemKind::SWATCHES:
|
|
return kSwatchRowHeight * m_scale;
|
|
case MenuItemKind::EDIT:
|
|
// 编辑项比普通项略高，给输入框留出上下呼吸空间。
|
|
return (kRowHeight + 4.0f) * m_scale;
|
|
case MenuItemKind::NORMAL:
|
|
default:
|
|
return kRowHeight * m_scale;
|
|
}
|
|
}
|
|
|
|
void PopupMenu::BuildLayout(const gd::RectF& bounds, int x, int y)
|
|
{
|
|
m_itemRects.assign(m_items.size(), gd::RectF());
|
|
m_swatchRects.assign(m_items.size(), std::vector<gd::RectF>());
|
|
|
|
if (m_fonts == nullptr)
|
|
{
|
|
m_rect = gd::RectF();
|
|
return;
|
|
}
|
|
|
|
float contentWidth = kMinWidth * m_scale;
|
|
float totalHeight = kPadV * 2.0f * m_scale;
|
|
|
|
for (std::size_t index = 0; index < m_items.size(); ++index)
|
|
{
|
|
const MenuItem& item = m_items[index];
|
|
totalHeight += ItemHeight(item);
|
|
|
|
if (item.kind == MenuItemKind::SWATCHES)
|
|
{
|
|
const int count = std::max(0, std::min(item.swatchCount, 16));
|
|
const float width = (kPadH + kItemPad) * 2.0f * m_scale +
|
|
static_cast<float>(count) * kSwatchSize * m_scale +
|
|
static_cast<float>(std::max(0, count - 1)) * kSwatchGap * m_scale;
|
|
contentWidth = std::max(contentWidth, width);
|
|
}
|
|
else if (item.kind == MenuItemKind::HEADER)
|
|
{
|
|
// 标题与普通项共用同一文字列与右侧标记列，保证整个菜单的左右边距一致。
|
|
const float width = (kPadH + kItemPad) * 2.0f * m_scale + kMarkerColumn * m_scale +
|
|
kMarkerGap * m_scale +
|
|
UiMeasureTextWidth(m_fonts->uiSmallBold, item.label);
|
|
contentWidth = std::max(contentWidth, width);
|
|
}
|
|
else if (item.kind == MenuItemKind::NORMAL)
|
|
{
|
|
const float width = (kPadH + kItemPad) * 2.0f * m_scale + kMarkerColumn * m_scale +
|
|
kMarkerGap * m_scale + UiMeasureTextWidth(m_fonts->uiSmall, item.label);
|
|
contentWidth = std::max(contentWidth, width);
|
|
}
|
|
else if (item.kind == MenuItemKind::EDIT)
|
|
{
|
|
// 说明文字 + 输入框；输入框宽度按数值文本自适应（与 EditFieldRect 保持一致）。
|
|
const float fieldWidth = NaturalEditFieldWidth(item);
|
|
const float width = (kPadH + kItemPad) * 2.0f * m_scale +
|
|
UiMeasureTextWidth(m_fonts->uiSmall, item.label) + kEditFieldGap * m_scale +
|
|
fieldWidth;
|
|
contentWidth = std::max(contentWidth, width);
|
|
}
|
|
}
|
|
|
|
contentWidth = std::min(contentWidth, kMaxWidth * m_scale);
|
|
const float width = contentWidth;
|
|
const float height = totalHeight;
|
|
|
|
float left = static_cast<float>(x);
|
|
float top = static_cast<float>(y);
|
|
|
|
// 优先向右下展开；越界时向左或向上翻转，最后做边界收敛。
|
|
if (left + width > bounds.X + bounds.Width)
|
|
{
|
|
left = static_cast<float>(x) - width;
|
|
}
|
|
if (top + height > bounds.Y + bounds.Height)
|
|
{
|
|
top = static_cast<float>(y) - height;
|
|
}
|
|
left = std::max(bounds.X + 2.0f, std::min(left, bounds.X + bounds.Width - width - 2.0f));
|
|
top = std::max(bounds.Y + 2.0f, std::min(top, bounds.Y + bounds.Height - height - 2.0f));
|
|
|
|
m_rect = gd::RectF(left, top, width, height);
|
|
|
|
float cursorY = top + kPadV * m_scale;
|
|
for (std::size_t index = 0; index < m_items.size(); ++index)
|
|
{
|
|
const MenuItem& item = m_items[index];
|
|
const float itemHeight = ItemHeight(item);
|
|
m_itemRects[index] = gd::RectF(left + kPadH * m_scale, cursorY,
|
|
std::max(0.0f, width - kPadH * 2.0f * m_scale), itemHeight);
|
|
|
|
if (item.kind == MenuItemKind::SWATCHES)
|
|
{
|
|
const int count = std::max(0, std::min(item.swatchCount, 16));
|
|
std::vector<gd::RectF>& rects = m_swatchRects[index];
|
|
rects.reserve(static_cast<std::size_t>(count));
|
|
const float swatchY = cursorY + (itemHeight - kSwatchSize * m_scale) * 0.5f;
|
|
const float startX = left + (kPadH + kItemPad) * m_scale;
|
|
for (int swatch = 0; swatch < count; ++swatch)
|
|
{
|
|
const float swatchX =
|
|
startX + static_cast<float>(swatch) * (kSwatchSize + kSwatchGap) * m_scale;
|
|
rects.push_back(gd::RectF(swatchX, swatchY, kSwatchSize * m_scale, kSwatchSize * m_scale));
|
|
}
|
|
}
|
|
|
|
cursorY += itemHeight;
|
|
}
|
|
}
|
|
|
|
float PopupMenu::NaturalEditFieldWidth(const MenuItem& item) const
|
|
{
|
|
return std::max(kEditFieldWidth * m_scale,
|
|
UiMeasureTextWidth(m_fonts->uiSmall, item.value) + 20.0f * m_scale);
|
|
}
|
|
|
|
gd::RectF PopupMenu::EditFieldRect(int index) const
|
|
{
|
|
if (index < 0 || index >= static_cast<int>(m_items.size()))
|
|
{
|
|
return gd::RectF();
|
|
}
|
|
const MenuItem& item = m_items[static_cast<std::size_t>(index)];
|
|
if (item.kind != MenuItemKind::EDIT)
|
|
{
|
|
return gd::RectF();
|
|
}
|
|
|
|
// 输入框靠右对齐到条目内容区右边界；宽度取自然宽度，但必须给说明文字留出自然宽度，
|
|
// 避免菜单被最大宽度夹取后输入框把左侧标签挤成省略号。
|
|
const gd::RectF& rect = m_itemRects[static_cast<std::size_t>(index)];
|
|
const float contentWidth = std::max(40.0f * m_scale, rect.Width - 2.0f * kItemPad * m_scale);
|
|
const float labelWidth = UiMeasureTextWidth(m_fonts->uiSmall, item.label) + kEditFieldGap * m_scale;
|
|
float width = NaturalEditFieldWidth(item);
|
|
width = std::min(width, std::max(40.0f * m_scale, contentWidth - labelWidth));
|
|
width = std::min(width, contentWidth * 0.75f);
|
|
|
|
const float height = rect.Height - kEditFieldPadV * 2.0f * m_scale;
|
|
return gd::RectF(rect.X + rect.Width - kItemPad * m_scale - width,
|
|
rect.Y + (rect.Height - height) * 0.5f, width, height);
|
|
}
|
|
|
|
int PopupMenu::EditingItemId() const
|
|
{
|
|
if (m_editIndex < 0 || m_editIndex >= static_cast<int>(m_items.size()))
|
|
{
|
|
return 0;
|
|
}
|
|
return m_items[static_cast<std::size_t>(m_editIndex)].id;
|
|
}
|
|
|
|
bool PopupMenu::IsOnEditField(int x, int y) const
|
|
{
|
|
if (m_editIndex < 0)
|
|
{
|
|
return false;
|
|
}
|
|
const gd::RectF rect = EditFieldRect(m_editIndex);
|
|
return UiPointInRect(rect, static_cast<float>(x), static_cast<float>(y));
|
|
}
|
|
|
|
bool PopupMenu::BeginItemEdit(int index)
|
|
{
|
|
if (!m_open || index < 0 || index >= static_cast<int>(m_items.size()))
|
|
{
|
|
return false;
|
|
}
|
|
const MenuItem& item = m_items[static_cast<std::size_t>(index)];
|
|
if (item.kind != MenuItemKind::EDIT || !item.enabled)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// 输入框初值取当前显示值，整段选中，便于直接键入新数值。
|
|
m_edit.Begin(item.value, true, item.filter, 0u);
|
|
m_editIndex = index;
|
|
m_hoverIndex = index;
|
|
return true;
|
|
}
|
|
|
|
bool PopupMenu::EndItemEdit(bool commit, MenuResult& result)
|
|
{
|
|
if (m_editIndex < 0)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
const int index = m_editIndex;
|
|
const std::wstring text = m_edit.Text();
|
|
m_editIndex = -1;
|
|
m_edit.End();
|
|
|
|
if (!commit || index >= static_cast<int>(m_items.size()))
|
|
{
|
|
return true;
|
|
}
|
|
|
|
MenuItem& item = m_items[static_cast<std::size_t>(index)];
|
|
// 立即回写显示值，使菜单上的数值与数据层一致（宿主会在派发后再纠正为夹取后的真实值）。
|
|
item.value = text;
|
|
|
|
result.valid = true;
|
|
result.scope = m_scope;
|
|
result.id = item.id;
|
|
result.editCommit = true;
|
|
result.editText = text;
|
|
return true;
|
|
}
|
|
|
|
void PopupMenu::RebuildLayout()
|
|
{
|
|
if (!m_open)
|
|
{
|
|
return;
|
|
}
|
|
BuildLayout(m_buildBounds, m_buildX, m_buildY);
|
|
}
|
|
|
|
bool PopupMenu::UpdateItemValue(int id, const std::wstring& value)
|
|
{
|
|
for (MenuItem& item : m_items)
|
|
{
|
|
if (item.id == id && item.kind == MenuItemKind::EDIT)
|
|
{
|
|
if (item.value == value)
|
|
{
|
|
return true;
|
|
}
|
|
item.value = value;
|
|
RebuildLayout();
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool PopupMenu::UpdateItemLabel(int id, const std::wstring& label, bool checked, bool enabled)
|
|
{
|
|
for (MenuItem& item : m_items)
|
|
{
|
|
if (item.id == id && item.kind == MenuItemKind::NORMAL)
|
|
{
|
|
if (item.label == label && item.checked == checked && item.enabled == enabled)
|
|
{
|
|
return true;
|
|
}
|
|
item.label = label;
|
|
item.checked = checked;
|
|
item.enabled = enabled;
|
|
RebuildLayout();
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
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)
|
|
{
|
|
m_items = items;
|
|
if (m_items.empty())
|
|
{
|
|
Close();
|
|
return;
|
|
}
|
|
|
|
m_scope = scope;
|
|
m_open = true;
|
|
m_hoverIndex = -1;
|
|
m_hoverSwatch = -1;
|
|
m_pressedIndex = -1;
|
|
m_pressedSwatch = -1;
|
|
m_buildBounds = bounds;
|
|
m_buildX = x;
|
|
m_buildY = y;
|
|
|
|
CloseEditState();
|
|
BuildLayout(bounds, x, y);
|
|
}
|
|
|
|
void PopupMenu::Close()
|
|
{
|
|
m_open = false;
|
|
m_scope = MenuScope::NONE;
|
|
m_items.clear();
|
|
m_itemRects.clear();
|
|
m_swatchRects.clear();
|
|
m_hoverIndex = -1;
|
|
m_hoverSwatch = -1;
|
|
m_pressedIndex = -1;
|
|
m_pressedSwatch = -1;
|
|
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;
|
|
}
|
|
return UiPointInRect(m_rect, static_cast<float>(x), static_cast<float>(y));
|
|
}
|
|
|
|
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 (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;
|
|
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;
|
|
}
|
|
|
|
int swatchIndex = -1;
|
|
const int index = ItemAtPoint(x, y, swatchIndex);
|
|
|
|
if (index == m_hoverIndex && swatchIndex == m_hoverSwatch)
|
|
{
|
|
return false;
|
|
}
|
|
m_hoverIndex = index;
|
|
m_hoverSwatch = swatchIndex;
|
|
return true;
|
|
}
|
|
|
|
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_editIndex >= 0)
|
|
{
|
|
if (IsOnEditField(x, y))
|
|
{
|
|
OnEditMouseDown(x, y);
|
|
m_pressedIndex = m_editIndex;
|
|
m_pressedSwatch = -1;
|
|
return true;
|
|
}
|
|
EndItemEdit(true, result);
|
|
}
|
|
|
|
int swatchIndex = -1;
|
|
m_pressedIndex = ItemAtPoint(x, y, swatchIndex);
|
|
m_pressedSwatch = swatchIndex;
|
|
return true;
|
|
}
|
|
|
|
bool PopupMenu::OnLButtonUp(int x, int y, MenuResult& result)
|
|
{
|
|
const MenuResult editResult = result;
|
|
result = MenuResult();
|
|
if (!m_open)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// 编辑态下松开：先结束拖拽框选，不当作普通项点击。
|
|
if (m_editIndex >= 0)
|
|
{
|
|
OnEditMouseUp();
|
|
m_pressedIndex = -1;
|
|
m_pressedSwatch = -1;
|
|
result = editResult;
|
|
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::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;
|
|
}
|
|
|
|
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:
|
|
Close();
|
|
return true;
|
|
case VK_DOWN:
|
|
MoveHover(1);
|
|
return true;
|
|
case VK_UP:
|
|
MoveHover(-1);
|
|
return true;
|
|
case VK_RETURN:
|
|
{
|
|
if (CommitHover(result))
|
|
{
|
|
Close();
|
|
}
|
|
return true;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void PopupMenu::Paint(gd::Graphics& g)
|
|
{
|
|
if (!m_open || m_theme == nullptr || m_fonts == nullptr || m_rect.Width <= 0.0f)
|
|
{
|
|
return;
|
|
}
|
|
|
|
// 投影：用两层递减透明度的圆角矩形模拟，避免引入系统阴影 API。
|
|
UiFillRoundRect(g, gd::RectF(m_rect.X + 1.0f * m_scale, m_rect.Y + 2.0f * m_scale, m_rect.Width,
|
|
m_rect.Height),
|
|
kCorner * m_scale, 0x14000000u);
|
|
UiFillRoundRect(g, gd::RectF(m_rect.X + 2.0f * m_scale, m_rect.Y + 4.0f * m_scale, m_rect.Width,
|
|
m_rect.Height),
|
|
kCorner * m_scale, 0x10000000u);
|
|
|
|
UiFillRoundRect(g, m_rect, kCorner * m_scale, m_theme->cardBg);
|
|
UiDrawRoundRect(g, m_rect, kCorner * m_scale, m_theme->borderStrong, 1.0f);
|
|
|
|
for (std::size_t index = 0; index < m_items.size(); ++index)
|
|
{
|
|
const MenuItem& item = m_items[index];
|
|
const gd::RectF& rect = m_itemRects[index];
|
|
|
|
if (item.kind == MenuItemKind::SEPARATOR)
|
|
{
|
|
const float lineY = rect.Y + rect.Height * 0.5f;
|
|
UiDrawLine(g, rect.X + kItemPad * m_scale, lineY,
|
|
rect.X + rect.Width - kItemPad * m_scale, lineY, m_theme->border, 1.0f);
|
|
continue;
|
|
}
|
|
|
|
if (item.kind == MenuItemKind::HEADER)
|
|
{
|
|
// 标题与普通项共用同一文字列，保证菜单内所有文本严格左对齐。
|
|
UiText(g, item.label, m_fonts->uiSmallBold,
|
|
gd::RectF(rect.X + kItemPad * m_scale, rect.Y, rect.Width, rect.Height),
|
|
m_theme->textMuted, TextAlign::LEFT);
|
|
continue;
|
|
}
|
|
|
|
const bool hovered = (static_cast<int>(index) == m_hoverIndex) &&
|
|
(item.kind != MenuItemKind::SWATCHES || m_hoverSwatch < 0);
|
|
|
|
if (item.kind == MenuItemKind::EDIT)
|
|
{
|
|
// 编辑项：左侧说明文字 + 右侧内联输入框（与拾色器的 RGB 编辑同一种处理方式，
|
|
// 菜单始终不关闭，数值就地修改）。
|
|
if (hovered && item.enabled && static_cast<int>(index) != m_editIndex)
|
|
{
|
|
UiFillRoundRect(g, rect, 4.0f * m_scale, WithAlpha(m_theme->accent, 0x22));
|
|
}
|
|
|
|
const std::uint32_t labelColor = item.enabled ? m_theme->text : m_theme->textMuted;
|
|
// 说明文字与普通项使用同一文字列（kItemPad），保证菜单内所有文本左对齐。
|
|
const float labelLeft = rect.X + kItemPad * m_scale;
|
|
const gd::RectF fieldRect = EditFieldRect(static_cast<int>(index));
|
|
const float labelWidth = std::max(8.0f, fieldRect.X - labelLeft - kEditFieldGap * m_scale);
|
|
UiText(g, UiEllipsize(g, item.label, m_fonts->uiSmall, labelWidth), m_fonts->uiSmall,
|
|
gd::RectF(labelLeft, rect.Y, labelWidth, rect.Height), labelColor, TextAlign::LEFT);
|
|
|
|
if (static_cast<int>(index) == m_editIndex)
|
|
{
|
|
UiDrawEditField(g, fieldRect, m_edit, m_fonts->uiSmall, m_scale);
|
|
}
|
|
else
|
|
{
|
|
UiFillRoundRect(g, fieldRect, 3.0f * m_scale, m_theme->pressed);
|
|
UiDrawRoundRect(g, fieldRect, 3.0f * m_scale, m_theme->border, 1.0f);
|
|
const std::wstring text =
|
|
UiEllipsize(g, item.value, m_fonts->uiSmall, fieldRect.Width - 12.0f * m_scale);
|
|
UiText(g, text, m_fonts->uiSmall,
|
|
gd::RectF(fieldRect.X + 6.0f * m_scale, fieldRect.Y,
|
|
std::max(8.0f, fieldRect.Width - 12.0f * m_scale), fieldRect.Height),
|
|
item.enabled ? m_theme->textStrong : m_theme->textMuted, TextAlign::LEFT);
|
|
}
|
|
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)
|
|
{
|
|
const gd::RectF& swatchRect = rects[swatch];
|
|
UiFillRoundRect(g, swatchRect, 4.0f * m_scale, item.swatches[swatch]);
|
|
|
|
const bool swatchHover = (static_cast<int>(index) == m_hoverIndex) &&
|
|
(static_cast<int>(swatch) == m_hoverSwatch);
|
|
if (static_cast<int>(swatch) == item.checkedSwatch || swatchHover)
|
|
{
|
|
const gd::RectF ring(swatchRect.X - 2.0f * m_scale, swatchRect.Y - 2.0f * m_scale,
|
|
swatchRect.Width + 4.0f * m_scale,
|
|
swatchRect.Height + 4.0f * m_scale);
|
|
UiDrawRoundRect(g, ring, 5.0f * m_scale,
|
|
(static_cast<int>(swatch) == item.checkedSwatch) ? m_theme->textStrong
|
|
: m_theme->borderStrong,
|
|
(static_cast<int>(swatch) == item.checkedSwatch) ? 1.8f : 1.0f);
|
|
}
|
|
}
|
|
continue;
|
|
}
|
|
|
|
// 普通项。
|
|
std::uint32_t background = 0;
|
|
if (hovered && item.enabled)
|
|
{
|
|
background = m_theme->accent;
|
|
}
|
|
else if (static_cast<int>(index) == m_pressedIndex)
|
|
{
|
|
background = m_theme->pressed;
|
|
}
|
|
if (background != 0)
|
|
{
|
|
UiFillRoundRect(g, rect, 4.0f * m_scale, background);
|
|
}
|
|
|
|
const std::uint32_t textColor = !item.enabled ? m_theme->textMuted
|
|
: ((hovered && item.enabled) ? m_theme->textOnAccent
|
|
: m_theme->text);
|
|
|
|
if (item.checked)
|
|
{
|
|
// 单选标记：对勾固定画在条目**右侧**的标记列内，左侧只留统一的小边距，
|
|
// 这样菜单文本左边距不会因为“可能存在的对勾”而被整体推右。
|
|
const float markerRight = rect.X + rect.Width - kItemPad * m_scale;
|
|
const float cx = markerRight - kMarkerColumn * m_scale * 0.5f;
|
|
const float cy = rect.Y + rect.Height * 0.5f;
|
|
const std::uint32_t markerColor = hovered ? m_theme->textOnAccent : m_theme->accent;
|
|
UiDrawLine(g, cx - 4.0f * m_scale, cy, cx - 1.0f * m_scale, cy + 3.0f * m_scale,
|
|
markerColor, 1.8f * m_scale);
|
|
UiDrawLine(g, cx - 1.0f * m_scale, cy + 3.0f * m_scale, cx + 4.5f * m_scale,
|
|
cy - 4.0f * m_scale, markerColor, 1.8f * m_scale);
|
|
}
|
|
|
|
const float textLeft = rect.X + kItemPad * m_scale;
|
|
const float textWidth =
|
|
rect.Width - 2.0f * kItemPad * m_scale - kMarkerColumn * m_scale - kMarkerGap * m_scale;
|
|
UiText(g, UiEllipsize(g, item.label, m_fonts->uiSmall, textWidth), m_fonts->uiSmall,
|
|
gd::RectF(textLeft, rect.Y, std::max(8.0f, textWidth), rect.Height), textColor,
|
|
TextAlign::LEFT);
|
|
}
|
|
}
|
|
|
|
} // namespace jdi
|