imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-30 13:05:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Updated ImGui to v1.91.5

Browse Source
This commit is contained in:
WerWolv
2024-11-24 18:55:56 +01:00
parent ded8cff415
commit fe9eecd031
24 changed files with 2499 additions and 1820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/builtin/include/content/helpers/diagrams.hpp
View File

@@ -135,7 +135,7 @@ namespace hex {
}
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImU32(ImColor(0, 0, 0)));
if (ImGui::BeginChild("##digram", size, ImGuiChildFlags_Border)) {
if (ImGui::BeginChild("##digram", size, ImGuiChildFlags_Borders)) {
auto drawList = ImGui::GetWindowDrawList();
if (m_textureValid) {
@@ -258,7 +258,7 @@ namespace hex {
}
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImU32(ImColor(0, 0, 0)));
if (ImGui::BeginChild("##layered_distribution", size, ImGuiChildFlags_Border)) {
if (ImGui::BeginChild("##layered_distribution", size, ImGuiChildFlags_Borders)) {
auto drawList = ImGui::GetWindowDrawList();
if (m_textureValid) {

2
plugins/builtin/source/content/themes.cpp
View File

@@ -70,7 +70,7 @@ namespace hex::plugin::builtin {
{ "table-row-background-alt", ImGuiCol_TableRowBgAlt },
{ "text-selected-background", ImGuiCol_TextSelectedBg },
{ "drag-drop-target", ImGuiCol_DragDropTarget },
{ "nav-highlight", ImGuiCol_NavHighlight },
{ "nav-highlight", ImGuiCol_NavCursor },
{ "nav-windowing-highlight", ImGuiCol_NavWindowingHighlight },
{ "nav-windowing-background", ImGuiCol_NavWindowingDimBg },
{ "modal-window-dim-background", ImGuiCol_ModalWindowDimBg },

2
plugins/builtin/source/content/views/view_about.cpp
View File

@@ -354,7 +354,7 @@ namespace hex::plugin::builtin {
ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 50);
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, scaled({ 12, 3 }));
if (ImGui::BeginChild(library.link, ImVec2(), ImGuiChildFlags_Border | ImGuiChildFlags_AutoResizeX | ImGuiChildFlags_AutoResizeY)) {
if (ImGui::BeginChild(library.link, ImVec2(), ImGuiChildFlags_Borders | ImGuiChildFlags_AutoResizeX | ImGuiChildFlags_AutoResizeY)) {
if (ImGuiExt::Hyperlink(hex::format("{}/{}", library.author, library.name).c_str())) {
hex::openWebpage(library.link);
}

9
plugins/builtin/source/content/views/view_command_palette.cpp
View File

@@ -3,6 +3,8 @@
#include <hex/api/content_registry.hpp>
#include <wolv/utils/guards.hpp>
#include "imstb_textedit.h"
namespace hex::plugin::builtin {
ViewCommandPalette::ViewCommandPalette() : View::Special("hex.builtin.view.command_palette.name") {
@@ -65,9 +67,10 @@ namespace hex::plugin::builtin {
if (m_moveCursorToEnd) {
auto textState = ImGui::GetInputTextState(ImGui::GetID("##command_input"));
if (textState != nullptr) {
textState->Stb.cursor =
textState->Stb.select_start =
textState->Stb.select_end = m_commandBuffer.size();
auto stb = reinterpret_cast<STB_TexteditState*>(textState->Stb);
stb->cursor =
stb->select_start =
stb->select_end = m_commandBuffer.size();
}
m_moveCursorToEnd = false;
}

2
plugins/builtin/source/content/views/view_information.cpp
View File

@@ -159,7 +159,7 @@ namespace hex::plugin::builtin {
bool enabled = section->isEnabled();
ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 5.0F);
if (ImGui::BeginChild(Lang(section->getUnlocalizedName()), ImVec2(0, 0), ImGuiChildFlags_Border | ImGuiChildFlags_AutoResizeY, ImGuiWindowFlags_MenuBar)) {
if (ImGui::BeginChild(Lang(section->getUnlocalizedName()), ImVec2(0, 0), ImGuiChildFlags_Borders | ImGuiChildFlags_AutoResizeY, ImGuiWindowFlags_MenuBar)) {
if (ImGui::BeginMenuBar()) {
// Draw the enable checkbox of the section

4
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@@ -1360,7 +1360,7 @@ namespace hex::plugin::builtin {
for (const auto &frame : **m_callStack | std::views::reverse) {
auto location = frame->getLocation();
std::string message;
if (location.source->source == pl::api::Source::DefaultSource) {
if (location.source->mainSource) {
if (m_lastEvaluationError->has_value())
message = processMessage((*m_lastEvaluationError)->message);
auto key = TextEditor::Coordinates(location.line, location.column);
@@ -1377,7 +1377,7 @@ namespace hex::plugin::builtin {
if (!m_lastCompileError->empty()) {
for (const auto &error : *m_lastCompileError) {
auto source = error.getLocation().source;
if (source != nullptr && source->source == pl::api::Source::DefaultSource) {
if (source != nullptr && source->mainSource) {
auto key = TextEditor::Coordinates(error.getLocation().line, error.getLocation().column);
if (!errorMarkers.contains(key) ||errorMarkers[key].first < error.getLocation().length)
errorMarkers[key] = std::make_pair(error.getLocation().length,processMessage(error.getMessage()));

2
plugins/ui/source/ui/hex_editor.cpp
View File

@@ -914,7 +914,7 @@ namespace hex::ui {
const auto windowEndPos = ImGui::GetWindowPos() + size - ImGui::GetStyle().WindowPadding;
ImGui::GetWindowDrawList()->AddLine(windowEndPos - ImVec2(0, size.y - 1_scaled), windowEndPos - size + ImVec2(0, 1_scaled), ImGui::GetColorU32(ImGuiCol_Separator), 2.0_scaled);
if (ImGui::BeginChild("##footer", size, ImGuiChildFlags_Border, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse)) {
if (ImGui::BeginChild("##footer", size, ImGuiChildFlags_Borders, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse)) {
ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 8_scaled);
ImGui::Dummy({});
if (ImGui::BeginTable("##footer_table", 3, ImGuiTableFlags_SizingFixedFit)) {

2
plugins/visualizers/source/content/pl_visualizers/3d_model.cpp
View File

@@ -462,7 +462,7 @@ namespace hex::plugin::visualizers {
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
ImGui::SetNextWindowSizeConstraints(scaled({ 350, 350 }), ImVec2(FLT_MAX, FLT_MAX));
if (ImGui::BeginChild("##image", textureSize, ImGuiChildFlags_ResizeX | ImGuiChildFlags_ResizeY | ImGuiChildFlags_Border, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse)) {
if (ImGui::BeginChild("##image", textureSize, ImGuiChildFlags_ResizeX | ImGuiChildFlags_ResizeY | ImGuiChildFlags_Borders, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse)) {
renderingWindowSize = ImGui::GetContentRegionAvail();
ImGui::Image(texture, textureSize, ImVec2(0, 1), ImVec2(1, 0));