gwm17/implot
1
0
Fork 0
mirror of https://github.com/gwm17/implot.git synced 2024-11-22 18:28:53 -05:00
Code Issues Projects Releases Wiki Activity

rev version, fix unused lines

Browse Source
This commit is contained in:
Evan Pezent 2021-07-29 19:14:13 -07:00
parent 864ebb90b6
commit c8601ac0d5
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
implot.cpp
View File

@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // 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 // calc plot frame sizes
ImVec2 title_size(0.0f, 0.0f); ImVec2 title_size(0.0f, 0.0f);
const float txt_height = ImGui::GetTextLineHeight();
if (!ImHasFlag(subplot.Flags, ImPlotSubplotFlags_NoTitle)) if (!ImHasFlag(subplot.Flags, ImPlotSubplotFlags_NoTitle))
title_size = ImGui::CalcTextSize(title, NULL, true); title_size = ImGui::CalcTextSize(title, NULL, true);
const float pad_top = title_size.x > 0.0f ? title_size.y + gp.Style.LabelPadding.y : 0; 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 // render splitters
if (!ImHasFlag(subplot.Flags, ImPlotSubplotFlags_NoResize)) { if (!ImHasFlag(subplot.Flags, ImPlotSubplotFlags_NoResize)) {
ImDrawList& DrawList = *ImGui::GetWindowDrawList(); 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 hov_col = ImGui::ColorConvertFloat4ToU32(GImGui->Style.Colors[ImGuiCol_SeparatorHovered]);
const ImU32 act_col = ImGui::ColorConvertFloat4ToU32(GImGui->Style.Colors[ImGuiCol_SeparatorActive]); const ImU32 act_col = ImGui::ColorConvertFloat4ToU32(GImGui->Style.Colors[ImGuiCol_SeparatorActive]);
float xpos = subplot.GridRect.Min.x; float xpos = subplot.GridRect.Min.x;
float ypos = subplot.GridRect.Min.y; float ypos = subplot.GridRect.Min.y;
const ImVec2 mouse = ImGui::GetIO().MousePos;
int separator = 1; int separator = 1;
// bool pass = false; // bool pass = false;
for (int r = 0; r < subplot.Rows-1; ++r) { for (int r = 0; r < subplot.Rows-1; ++r) {

4
implot.h
View File

@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // SOFTWARE.
// ImPlot v0.11 WIP // ImPlot v0.12 WIP
#pragma once #pragma once
#include "imgui.h" #include "imgui.h"
@ -38,7 +38,7 @@
#endif #endif
// ImPlot version string // ImPlot version string
#define IMPLOT_VERSION "0.11 WIP" #define IMPLOT_VERSION "0.12 WIP"
// Indicates variable should deduced automatically. // Indicates variable should deduced automatically.
#define IMPLOT_AUTO -1 #define IMPLOT_AUTO -1
// Special color used to indicate that a color should be deduced automatically. // Special color used to indicate that a color should be deduced automatically.

2
implot_demo.cpp
View File

@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // SOFTWARE.
// ImPlot v0.11 WIP // ImPlot v0.12 WIP
#include "implot.h" #include "implot.h"
#include <math.h> #include <math.h>

2
implot_internal.h
View File

@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // SOFTWARE.
// ImPlot v0.11 WIP // ImPlot v0.12 WIP
// You may use this file to debug, understand or extend ImPlot features but we // You may use this file to debug, understand or extend ImPlot features but we
// don't provide any guarantee of forward compatibility! // don't provide any guarantee of forward compatibility!

2
implot_items.cpp
View File

@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // SOFTWARE.
// ImPlot v0.11 WIP // ImPlot v0.12 WIP
#include "implot.h" #include "implot.h"
#include "implot_internal.h" #include "implot_internal.h"