mirror of
https://github.com/WerWolv/ImHex.git
synced 2026-04-02 05:27:41 -05:00
build: Update ImGui and its dependencies (#1122)
This PR updates imgui and its dependencies from the last time, ~1 year ago (deabacbd50) Commits will be refactored before merging Things you might ask : - why did you remove `ImGui_ImplGlfw_SetBorderlessWindowMode()` ? -> Where is it used ? The only usage of it I see is commented (cb9a3b1f55/lib/external/imgui/source/imgui_impl_glfw.cpp (L757)) - why did you remove the implot anti aliasing flag ? -> They.. seem to have removed it altogether ? https://github.com/epezent/implot/issues/479
This commit is contained in:
@@ -1123,7 +1123,8 @@ namespace hex::plugin::builtin {
|
||||
|
||||
void drawPlot(const ImVec2 &viewSize) {
|
||||
if (ImPlot::BeginPlot("##distribution", viewSize, ImPlotFlags_NoLegend | ImPlotFlags_NoMenus | ImPlotFlags_NoBoxSelect)) {
|
||||
ImPlot::SetupAxes("Address", "Count", ImPlotAxisFlags_Lock, ImPlotAxisFlags_Lock | ImPlotAxisFlags_LogScale);
|
||||
ImPlot::SetupAxes("Address", "Count", ImPlotAxisFlags_Lock, ImPlotAxisFlags_Lock);
|
||||
ImPlot::SetupAxisScale(ImAxis_Y1, ImPlotScale_Log10);
|
||||
ImPlot::SetupAxesLimits(0, 256, 1, double(*std::max_element(this->m_counts.begin(), this->m_counts.end())) * 1.1F, ImGuiCond_Always);
|
||||
|
||||
static auto x = [] {
|
||||
|
||||
@@ -68,8 +68,8 @@ namespace hex::plugin::builtin {
|
||||
|
||||
if (ImGui::BeginChild("##results", ImGui::GetContentRegionAvail(), false, ImGuiWindowFlags_AlwaysVerticalScrollbar | ImGuiWindowFlags_NavFlattened)) {
|
||||
for (const auto &[displayResult, matchedCommand, callback] : this->m_lastResults) {;
|
||||
ImGui::PushAllowKeyboardFocus(true);
|
||||
ON_SCOPE_EXIT { ImGui::PopAllowKeyboardFocus(); };
|
||||
ImGui::PushTabStop(true);
|
||||
ON_SCOPE_EXIT { ImGui::PopTabStop(); };
|
||||
|
||||
if (ImGui::Selectable(displayResult.c_str(), false, ImGuiSelectableFlags_DontClosePopups)) {
|
||||
callback(matchedCommand);
|
||||
|
||||
@@ -232,7 +232,7 @@ namespace hex::plugin::builtin {
|
||||
ImGui::TextUnformatted("hex.builtin.view.information.byte_types"_lang);
|
||||
this->m_byteTypesDistribution.draw(
|
||||
ImVec2(-1, 0),
|
||||
ImPlotFlags_NoChild | ImPlotFlags_NoMenus | ImPlotFlags_NoBoxSelect | ImPlotFlags_AntiAliased,
|
||||
ImPlotFlags_NoChild | ImPlotFlags_NoMenus | ImPlotFlags_NoBoxSelect,
|
||||
true
|
||||
);
|
||||
|
||||
@@ -240,7 +240,7 @@ namespace hex::plugin::builtin {
|
||||
ImGui::TextUnformatted("hex.builtin.view.information.entropy"_lang);
|
||||
this->m_chunkBasedEntropy.draw(
|
||||
ImVec2(-1, 0),
|
||||
ImPlotFlags_NoChild | ImPlotFlags_CanvasOnly | ImPlotFlags_AntiAliased,
|
||||
ImPlotFlags_NoChild | ImPlotFlags_CanvasOnly,
|
||||
true
|
||||
);
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
#include <content/popups/popup_notification.hpp>
|
||||
|
||||
#include <imgui.h>
|
||||
#define IMGUI_DEFINE_MATH_OPERATORS
|
||||
#include <imgui_internal.h>
|
||||
|
||||
#include <hex/helpers/utils.hpp>
|
||||
|
||||
Reference in New Issue
Block a user