From c8601ac0d5aad636de797033a9e29160c8cfeade Mon Sep 17 00:00:00 2001 From: Evan Pezent Date: Thu, 29 Jul 2021 19:14:13 -0700 Subject: [PATCH] rev version, fix unused lines --- implot.cpp | 5 +---- implot.h | 4 ++-- implot_demo.cpp | 2 +- implot_internal.h | 2 +- implot_items.cpp | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/implot.cpp b/implot.cpp index 25a4ac6..8c8ef71 100644 --- a/implot.cpp +++ b/implot.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -// ImPlot v0.11 WIP +// ImPlot v0.12 WIP /* @@ -2809,7 +2809,6 @@ bool BeginSubplots(const char* title, int rows, int cols, const ImVec2& size, Im // calc plot frame sizes ImVec2 title_size(0.0f, 0.0f); - const float txt_height = ImGui::GetTextLineHeight(); if (!ImHasFlag(subplot.Flags, ImPlotSubplotFlags_NoTitle)) title_size = ImGui::CalcTextSize(title, NULL, true); const float pad_top = title_size.x > 0.0f ? title_size.y + gp.Style.LabelPadding.y : 0; @@ -2852,12 +2851,10 @@ bool BeginSubplots(const char* title, int rows, int cols, const ImVec2& size, Im // render splitters if (!ImHasFlag(subplot.Flags, ImPlotSubplotFlags_NoResize)) { ImDrawList& DrawList = *ImGui::GetWindowDrawList(); - const ImU32 nrm_col = ImGui::ColorConvertFloat4ToU32(GImGui->Style.Colors[ImGuiCol_Separator]); const ImU32 hov_col = ImGui::ColorConvertFloat4ToU32(GImGui->Style.Colors[ImGuiCol_SeparatorHovered]); const ImU32 act_col = ImGui::ColorConvertFloat4ToU32(GImGui->Style.Colors[ImGuiCol_SeparatorActive]); float xpos = subplot.GridRect.Min.x; float ypos = subplot.GridRect.Min.y; - const ImVec2 mouse = ImGui::GetIO().MousePos; int separator = 1; // bool pass = false; for (int r = 0; r < subplot.Rows-1; ++r) { diff --git a/implot.h b/implot.h index 33a64d7..9056c27 100644 --- a/implot.h +++ b/implot.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -// ImPlot v0.11 WIP +// ImPlot v0.12 WIP #pragma once #include "imgui.h" @@ -38,7 +38,7 @@ #endif // ImPlot version string -#define IMPLOT_VERSION "0.11 WIP" +#define IMPLOT_VERSION "0.12 WIP" // Indicates variable should deduced automatically. #define IMPLOT_AUTO -1 // Special color used to indicate that a color should be deduced automatically. diff --git a/implot_demo.cpp b/implot_demo.cpp index a1ef3e2..720b1b9 100644 --- a/implot_demo.cpp +++ b/implot_demo.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -// ImPlot v0.11 WIP +// ImPlot v0.12 WIP #include "implot.h" #include diff --git a/implot_internal.h b/implot_internal.h index 065c2d0..45c8b67 100644 --- a/implot_internal.h +++ b/implot_internal.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -// ImPlot v0.11 WIP +// ImPlot v0.12 WIP // You may use this file to debug, understand or extend ImPlot features but we // don't provide any guarantee of forward compatibility! diff --git a/implot_items.cpp b/implot_items.cpp index 477980a..64e5962 100644 --- a/implot_items.cpp +++ b/implot_items.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -// ImPlot v0.11 WIP +// ImPlot v0.12 WIP #include "implot.h" #include "implot_internal.h"