From eb0bd801744810a0ab64cf3f6ae6a776334c1d7f Mon Sep 17 00:00:00 2001 From: chatlanin Date: Thu, 16 Oct 2025 15:19:22 +0300 Subject: [PATCH] add new name macros --- example/layers/ui_layer/ui_layer.cpp | 2 +- example/layers/ui_layer_double/ui_layer_double.cpp | 2 ++ example/layers/ui_layer_double/ui_layer_double.hpp | 2 +- src/vertex_engine/utils/define.hpp | 4 +++- src/vertex_engine/utils/func.hpp | 9 ++------- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/example/layers/ui_layer/ui_layer.cpp b/example/layers/ui_layer/ui_layer.cpp index a6171ca..fb41525 100755 --- a/example/layers/ui_layer/ui_layer.cpp +++ b/example/layers/ui_layer/ui_layer.cpp @@ -44,7 +44,7 @@ namespace example ImGui::SetNextWindowPos(m_pos); ImGui::SetNextWindowSize(m_size); - if (!ImGui::Begin(VE_NAME("Test signal"), nullptr, m_win_flags)) ImGui::End(); + if (!ImGui::Begin(VE_NO_NAME("Test signal"), nullptr, m_win_flags)) ImGui::End(); if (ImGui::Button("Test signal", ImVec2(128, 130))) { diff --git a/example/layers/ui_layer_double/ui_layer_double.cpp b/example/layers/ui_layer_double/ui_layer_double.cpp index f660e77..8675888 100755 --- a/example/layers/ui_layer_double/ui_layer_double.cpp +++ b/example/layers/ui_layer_double/ui_layer_double.cpp @@ -9,6 +9,8 @@ namespace example CONNECT(this); hack::log()("on_attach"); + + m_win_flags &= ~ImGuiWindowFlags_NoTitleBar; } void ui_layer_double::on_detach() diff --git a/example/layers/ui_layer_double/ui_layer_double.hpp b/example/layers/ui_layer_double/ui_layer_double.hpp index 2be5318..334344f 100755 --- a/example/layers/ui_layer_double/ui_layer_double.hpp +++ b/example/layers/ui_layer_double/ui_layer_double.hpp @@ -9,7 +9,7 @@ namespace example VE_OVERIDE(); VE_EVENT_OVERIDE(); - ImVec2 m_size = ImVec2{ 400.f, 400.f }; + ImVec2 m_size = ImVec2{ 800.f, 800.f }; ImVec2 m_pos = ImVec2{ 400.f, 400.f }; std::string m_key; }; diff --git a/src/vertex_engine/utils/define.hpp b/src/vertex_engine/utils/define.hpp index d6c0bfc..52d2157 100755 --- a/src/vertex_engine/utils/define.hpp +++ b/src/vertex_engine/utils/define.hpp @@ -18,7 +18,9 @@ ImGui::PushFont(VE::style::fonts::get_font(VE::style::fonts::font_type::def_font, def_size)) #define VE_POP_FONT() ImGui::PopFont() -#define VE_NAME(n) VE::func::name(n).data() +#define VE_NO_NAME(n) VE::func::name(n).data() +#define VE_NAME(n) VE::func::name(n, "").data() + #define VE_COLOR(c, t) VE::func::color(c, t) #define VE_GLGETSTRING(n) reinterpret_cast(glGetString(n)) diff --git a/src/vertex_engine/utils/func.hpp b/src/vertex_engine/utils/func.hpp index 74ad363..fbc1434 100644 --- a/src/vertex_engine/utils/func.hpp +++ b/src/vertex_engine/utils/func.hpp @@ -5,14 +5,9 @@ namespace VE::func { - // HERE - // как то не однозначно это - // т.к. вызов макроса VE_NAME(имя) как-то подразумевает что будет напечатоно имя блока - // а тут наоборот делается ## так что имя не было напечатано - // разумнее может NO_NAME??? - inline auto name(std::string n) + inline auto name(std::string n, std::string key_no_name = "##") { - return "##" + n; + return key_no_name + n; } inline ImU32 color(std::string hex, unsigned char alpha = 255)