feat: 重构信号样式区并统一主题化弹出菜单
样式编辑区： - 移除顶部「样式 + 信号名 + 文件名」标题行，选中信号即代表编辑目标。 - 绘制方式取消阶梯选项，仅保留线段/散点/点线，标签由「方式」改为「样式」。 - 线宽改为「最细预设 + 数值旋钮 + 最粗预设」：中间为带左右增减箭头的输入框， 步进 0.2px，取值范围 0.5-6.0px，并标注单位为 px。 - 颜色在 10 个预设色块后新增带加号图标的方格，点击展开 RGB 三通道滑块面板， 可实时预览并显示十六进制值；点击面板外任意位置收起。 - 移除网格归属下拉框，改由每条信号行末尾的 G 徽标承载，点击弹出网格归属菜单。 信号面板与菜单： - 文件分组行新增关闭按钮，可直接从工作区移除该文件，与整体风格保持一致。 - 新增 PopupMenu 组件：绘制在窗口后备缓冲区内的自绘菜单，含圆角、投影、悬停高亮、 单选对勾、色块行与分组标题，彻底替换系统默认弹出菜单； 菜单打开期间接管鼠标与键盘（Esc / 上下键 / 回车），失焦或在菜单外释放时自动关闭。 - 信号、文件、网格、标签页四类右键菜单全部改用该组件。 其他修复： - 信号名称不再保留尾部单位括号，避免名称后再重复显示单位。 - 数据模型移除 DrawMode::STEP 枚举。 - 标签栏与信号面板弹出菜单后补充重绘请求，修复菜单不显示的问题。
This commit is contained in:
DeepSeek V4.1 Flash committed
1 parent
9c6c374cce
commit
eb868b2679
12 files changed
+2148
-531
No files matched your search
@@ -195,7 +195,9 @@ namespace jdi
|
||||
m_tabBar.SetScale(m_scale);
|
||||
m_toolbar.Setup(&m_fonts, &m_theme);
|
||||
m_toolbar.SetScale(m_scale);
|
||||
m_panel.Setup(m_hwnd, &m_fonts, &m_theme);
|
||||
m_menu.Setup(&m_fonts, &m_theme);
|
||||
m_menu.SetScale(m_scale);
|
||||
m_panel.Setup(m_hwnd, &m_fonts, &m_theme, &m_menu);
|
||||
m_panel.SetScale(m_scale);
|
||||
m_plot.Setup(&m_fonts, &m_theme);
|
||||
m_plot.SetScale(m_scale);
|
||||
@@ -239,6 +241,7 @@ namespace jdi
|
||||
m_fonts.Create(dpi);
|
||||
m_tabBar.SetScale(m_scale);
|
||||
m_toolbar.SetScale(m_scale);
|
||||
m_menu.SetScale(m_scale);
|
||||
m_panel.SetScale(m_scale);
|
||||
m_plot.SetScale(m_scale);
|
||||
ReleaseBackBuffer();
|
||||
@@ -453,6 +456,7 @@ namespace jdi
|
||||
|
||||
m_tabBar.Layout(m_tabBarRect);
|
||||
m_toolbar.Layout(m_toolbarRect);
|
||||
m_panel.SetClientBounds(gd::RectF(0.0f, 0.0f, width, height));
|
||||
m_panel.Layout(m_panelRect);
|
||||
m_plot.Layout(m_plotRect);
|
||||
}
|
||||
@@ -528,6 +532,12 @@ namespace jdi
|
||||
return;
|
||||
}
|
||||
|
||||
// 面板内展开/收起自定义颜色面板等操作会改变面板所需高度。
|
||||
if (m_panel.TakeLayoutDirty())
|
||||
{
|
||||
Relayout();
|
||||
}
|
||||
|
||||
// 任何交互（勾选、移动网格、切换标签页）之后都在此统一收敛视图状态。
|
||||
SynchronizeView(false);
|
||||
|
||||
@@ -559,6 +569,9 @@ namespace jdi
|
||||
UiFillRect(g, m_splitterRect, m_theme.border);
|
||||
|
||||
PaintStatusBar(g);
|
||||
|
||||
// 弹出菜单始终绘制在最上层，保证与主界面风格一致。
|
||||
m_menu.Paint(g);
|
||||
}
|
||||
|
||||
HDC windowDc = GetDC(m_hwnd);
|
||||
@@ -701,6 +714,7 @@ namespace jdi
|
||||
{
|
||||
const DataFile* file = m_dataSet.FileAt(existing);
|
||||
SetStatusMessage(L"该文件已在工作区中：" + (file != nullptr ? file->fileName : path), true);
|
||||
InvalidateRect(m_hwnd, nullptr, FALSE);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -709,6 +723,7 @@ namespace jdi
|
||||
if (!LoadCsvTable(path, table, error))
|
||||
{
|
||||
SetStatusMessage(L"解析失败：" + error, true);
|
||||
InvalidateRect(m_hwnd, nullptr, FALSE);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -716,6 +731,7 @@ namespace jdi
|
||||
if (!m_dataSet.AddFromTable(table, path, error, fileIndex))
|
||||
{
|
||||
SetStatusMessage(L"解析失败：" + error, true);
|
||||
InvalidateRect(m_hwnd, nullptr, FALSE);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -968,45 +984,162 @@ namespace jdi
|
||||
return;
|
||||
}
|
||||
|
||||
HMENU menu = CreatePopupMenu();
|
||||
if (menu == nullptr)
|
||||
m_tabMenuIndex = result.index;
|
||||
|
||||
std::vector<MenuItem> items;
|
||||
|
||||
MenuItem header;
|
||||
header.kind = MenuItemKind::HEADER;
|
||||
header.label = m_tabs[static_cast<std::size_t>(result.index)].Name();
|
||||
items.push_back(header);
|
||||
|
||||
MenuItem create;
|
||||
create.label = L"新建标签页";
|
||||
create.id = kMenuTabNew;
|
||||
items.push_back(create);
|
||||
|
||||
MenuItem close;
|
||||
close.label = L"关闭该标签页";
|
||||
close.id = kMenuTabClose;
|
||||
close.enabled = (m_tabs.size() > 1);
|
||||
items.push_back(close);
|
||||
|
||||
MenuItem closeOthers;
|
||||
closeOthers.label = L"关闭其它标签页";
|
||||
closeOthers.id = kMenuTabCloseOthers;
|
||||
closeOthers.enabled = (m_tabs.size() > 1);
|
||||
items.push_back(closeOthers);
|
||||
|
||||
// 菜单绘制在客户区内，因此把屏幕坐标换算为客户区坐标。
|
||||
POINT anchor = {result.screenX, result.screenY};
|
||||
ScreenToClient(m_hwnd, &anchor);
|
||||
|
||||
RECT client = {};
|
||||
GetClientRect(m_hwnd, &client);
|
||||
const gd::RectF bounds(0.0f, 0.0f, static_cast<float>(client.right - client.left),
|
||||
static_cast<float>(client.bottom - client.top));
|
||||
|
||||
m_menu.Open(MenuScope::TAB_BAR, bounds, anchor.x, anchor.y, items);
|
||||
}
|
||||
|
||||
void Application::DispatchMenuResult(const MenuResult& result)
|
||||
{
|
||||
if (!result.valid)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
AppendMenuW(menu, MF_STRING, static_cast<UINT_PTR>(kMenuTabNew), L"新建标签页");
|
||||
AppendMenuW(menu, MF_STRING, static_cast<UINT_PTR>(kMenuTabClose), L"关闭该标签页");
|
||||
AppendMenuW(menu, MF_STRING, static_cast<UINT_PTR>(kMenuTabCloseOthers), L"关闭其它标签页");
|
||||
if (m_tabs.size() <= 1)
|
||||
switch (result.scope)
|
||||
{
|
||||
EnableMenuItem(menu, static_cast<UINT>(kMenuTabClose), MF_BYCOMMAND | MF_GRAYED);
|
||||
EnableMenuItem(menu, static_cast<UINT>(kMenuTabCloseOthers), MF_BYCOMMAND | MF_GRAYED);
|
||||
case MenuScope::SIGNAL_PANEL:
|
||||
{
|
||||
const bool needRelayout = m_panel.OnMenuCommand(result);
|
||||
if (needRelayout)
|
||||
{
|
||||
Relayout();
|
||||
}
|
||||
InvalidateRect(m_hwnd, nullptr, FALSE);
|
||||
break;
|
||||
}
|
||||
|
||||
SetForegroundWindow(m_hwnd);
|
||||
const int command = TrackPopupMenu(menu, TPM_RETURNCMD | TPM_LEFTALIGN | TPM_TOPALIGN,
|
||||
result.screenX, result.screenY, 0, m_hwnd, nullptr);
|
||||
DestroyMenu(menu);
|
||||
|
||||
if (command == kMenuTabNew)
|
||||
case MenuScope::TAB_BAR:
|
||||
{
|
||||
NewTab();
|
||||
const int index = m_tabMenuIndex;
|
||||
if (result.id == kMenuTabNew)
|
||||
{
|
||||
NewTab();
|
||||
}
|
||||
else if (result.id == kMenuTabClose)
|
||||
{
|
||||
CloseTab(index);
|
||||
}
|
||||
else if (result.id == kMenuTabCloseOthers)
|
||||
{
|
||||
if (index >= 0 && index < static_cast<int>(m_tabs.size()) && m_tabs.size() > 1)
|
||||
{
|
||||
const TabConfig keep = m_tabs[static_cast<std::size_t>(index)];
|
||||
m_tabs.clear();
|
||||
m_tabs.push_back(keep);
|
||||
SetActiveTab(0);
|
||||
}
|
||||
}
|
||||
m_tabMenuIndex = -1;
|
||||
InvalidateRect(m_hwnd, nullptr, TRUE);
|
||||
break;
|
||||
}
|
||||
else if (command == kMenuTabClose)
|
||||
{
|
||||
CloseTab(result.index);
|
||||
}
|
||||
else if (command == kMenuTabCloseOthers)
|
||||
{
|
||||
const TabConfig keep = m_tabs[static_cast<std::size_t>(result.index)];
|
||||
m_tabs.clear();
|
||||
m_tabs.push_back(keep);
|
||||
SetActiveTab(0);
|
||||
case MenuScope::NONE:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
LRESULT Application::HandleMessage(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
// 菜单打开时优先消费鼠标与键盘事件，形成模态交互。
|
||||
if (m_menu.IsOpen())
|
||||
{
|
||||
// 菜单接管输入后，取消底层组件可能仍在进行的拖拽。
|
||||
if (m_activeTarget != Target::NONE || m_draggingSplitter)
|
||||
{
|
||||
ReleaseCapture();
|
||||
m_activeTarget = Target::NONE;
|
||||
m_draggingSplitter = false;
|
||||
m_panel.OnLButtonUp(0, 0);
|
||||
m_plot.OnLButtonUp(0, 0);
|
||||
}
|
||||
|
||||
switch (message)
|
||||
{
|
||||
case WM_MOUSEMOVE:
|
||||
if (m_menu.OnMouseMove(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)))
|
||||
{
|
||||
InvalidateRect(hwnd, nullptr, FALSE);
|
||||
}
|
||||
return 0;
|
||||
case WM_LBUTTONDOWN:
|
||||
{
|
||||
MenuResult result;
|
||||
m_menu.OnLButtonDown(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), result);
|
||||
InvalidateRect(hwnd, nullptr, FALSE);
|
||||
return 0;
|
||||
}
|
||||
case WM_LBUTTONUP:
|
||||
{
|
||||
MenuResult result;
|
||||
m_menu.OnLButtonUp(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), result);
|
||||
InvalidateRect(hwnd, nullptr, FALSE);
|
||||
DispatchMenuResult(result);
|
||||
return 0;
|
||||
}
|
||||
case WM_RBUTTONDOWN:
|
||||
case WM_MBUTTONDOWN:
|
||||
case WM_MOUSEWHEEL:
|
||||
m_menu.Close();
|
||||
InvalidateRect(hwnd, nullptr, FALSE);
|
||||
return 0;
|
||||
case WM_KEYDOWN:
|
||||
{
|
||||
MenuResult result;
|
||||
m_menu.OnKeyDown(wParam, result);
|
||||
InvalidateRect(hwnd, nullptr, FALSE);
|
||||
if (result.valid)
|
||||
{
|
||||
DispatchMenuResult(result);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
case WM_KILLFOCUS:
|
||||
case WM_CANCELMODE:
|
||||
m_menu.Close();
|
||||
InvalidateRect(hwnd, nullptr, FALSE);
|
||||
return 0;
|
||||
case WM_SETCURSOR:
|
||||
SetCursor(LoadCursorW(nullptr, IDC_ARROW));
|
||||
return TRUE;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
switch (message)
|
||||
{
|
||||
case WM_SIZE:
|
||||
@@ -1087,6 +1220,15 @@ namespace jdi
|
||||
const int x = GET_X_LPARAM(lParam);
|
||||
const int y = GET_Y_LPARAM(lParam);
|
||||
|
||||
// 点击面板之外的位置时收起面板内展开的自定义颜色面板。
|
||||
if (!m_panel.HitTest(x, y))
|
||||
{
|
||||
if (m_panel.CloseTransientUi())
|
||||
{
|
||||
InvalidateRect(hwnd, nullptr, FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
if (UiPointInRect(m_splitterRect, static_cast<float>(x), static_cast<float>(y)))
|
||||
{
|
||||
SetCapture(hwnd);
|
||||
@@ -1157,6 +1299,7 @@ namespace jdi
|
||||
m_tabBar.OnLButtonUp(x, y, result);
|
||||
m_activeTarget = Target::NONE;
|
||||
OnTabBarResult(result);
|
||||
InvalidateRect(hwnd, nullptr, FALSE);
|
||||
return 0;
|
||||
}
|
||||
case Target::TOOLBAR:
|
||||
@@ -1219,6 +1362,8 @@ namespace jdi
|
||||
if (m_tabBar.OnRButtonDown(x, y, cursor.x, cursor.y, result))
|
||||
{
|
||||
OnTabBarResult(result);
|
||||
// 自绘菜单会覆盖在客户区之上，必须请求重绘才能显示。
|
||||
InvalidateRect(hwnd, nullptr, FALSE);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user