From dc51023a31ecd7ac6900a97c3d49ad0ecbdd4cda Mon Sep 17 00:00:00 2001 From: Lveyou <1339484752@qq.com> Date: Sat, 20 Sep 2025 16:28:52 +0800 Subject: [PATCH] =?UTF-8?q?*=20=E6=8B=96=E6=8B=BDpanel=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dl/memory/dl_memory_pool.h | 2 +- dl/tool/dl_tool_manager.cpp | 1 + dl/ui/dl_ui_panel.cpp | 5 ++++- dl/ui/dl_ui_panel.h | 11 +++++++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dl/memory/dl_memory_pool.h b/dl/memory/dl_memory_pool.h index fb2f8d48..f171442c 100644 --- a/dl/memory/dl_memory_pool.h +++ b/dl/memory/dl_memory_pool.h @@ -211,7 +211,7 @@ private: } private: // 可使用的节点内存 - std::list _listFree; + std::list _listFree; // TODO 可改为vector std::list _listUsed; // 回调 std::function _cbDelete; diff --git a/dl/tool/dl_tool_manager.cpp b/dl/tool/dl_tool_manager.cpp index 588d9f1f..850f2362 100644 --- a/dl/tool/dl_tool_manager.cpp +++ b/dl/tool/dl_tool_manager.cpp @@ -15,6 +15,7 @@ namespace dl::Tool _panel->SetSize({ 600, 400 }); _panel->SetPosScale({ 0.5f, 0.5f }); _panel->SetAlign(Align::CC); + _panel->SetDebugName("DL Tool Manager"); { UI::Background* bg = g_ui->CreateBackgroundDefault(); bg->SetSize({ 600, 400 }); diff --git a/dl/ui/dl_ui_panel.cpp b/dl/ui/dl_ui_panel.cpp index a0c4d545..be1f7d78 100644 --- a/dl/ui/dl_ui_panel.cpp +++ b/dl/ui/dl_ui_panel.cpp @@ -439,11 +439,14 @@ void Panel::_update_cpt_drag(Components* cpt) if (get_coor) coor = get_coor->Call(); } + Position pos_pre = coor->GetPosition(); drag->Update(coor, cpt_pickup->Call()); + Position pos_dt = coor->GetPosition() - pos_pre; if (drag->_bControlPanel) { - _posPixel += drag->_posMove; + _posPixel += pos_dt; + log_info("拖拽:{} dt {}", to_string(_posPixel), to_string(pos_dt)); } } diff --git a/dl/ui/dl_ui_panel.h b/dl/ui/dl_ui_panel.h index 49403a93..106afdef 100644 --- a/dl/ui/dl_ui_panel.h +++ b/dl/ui/dl_ui_panel.h @@ -590,6 +590,13 @@ public: UI::Text* ExGetText(size_t n = 0, bool show_log = true); //! 设置第n个text内容 void ExSetString(std::string_view str, size_t n = 0); + + void SetDebugName(std::string_view name) + { +#ifndef NDEBUG + _debugName = name; +#endif + } private: Panel() : _order{ Z_DEFAULT_PANEL }, @@ -628,6 +635,10 @@ private: } delete _coor; } +#ifndef NDEBUG + std::string _debugName; +#endif + // 添加到 Scene时自动设置 std::string _name; std::vector _allEle;// 子元素