Skip to content

Commit e8baaa1

Browse files
committed
fix: compilation error after rebase
1 parent d689156 commit e8baaa1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

implot.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ struct ImPlotStyleVarInfo {
288288
static const ImPlotStyleVarInfo GPlotStyleVarInfo[] =
289289
{
290290
{ ImGuiDataType_Float, 2, (ImU32)offsetof(ImPlotStyle, PlotDefaultSize) }, // ImPlotStyleVar_PlotDefaultSize
291-
{ ImGuiDataType_Float, 2, (ImU32)offsetof(ImPlotStyle, PlotMinSize) } // ImPlotStyleVar_PlotMinSize
291+
{ ImGuiDataType_Float, 2, (ImU32)offsetof(ImPlotStyle, PlotMinSize) }, // ImPlotStyleVar_PlotMinSize
292292
{ ImGuiDataType_Float, 1, (ImU32)offsetof(ImPlotStyle, PlotBorderSize) }, // ImPlotStyleVar_PlotBorderSize
293293
{ ImGuiDataType_Float, 1, (ImU32)offsetof(ImPlotStyle, MinorAlpha) }, // ImPlotStyleVar_MinorAlpha
294294
{ ImGuiDataType_Float, 2, (ImU32)offsetof(ImPlotStyle, MajorTickLen) }, // ImPlotStyleVar_MajorTickLen

implot_items.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2280,7 +2280,7 @@ void PlotPieChartEx(const char* const label_ids[], IndexerIdx<T> indexer, ImPlot
22802280
a1 = a0 + 2 * IM_PI * percent;
22812281

22822282
if (BeginItemEx(label_ids[i], FitterRect(Pmin, Pmax), spec)) {
2283-
const bool hovered = ImPlot::IsLegendEntryHovered(label_ids[i]) && ImHasFlag(flags, ImPlotPieChartFlags_Exploding);
2283+
const bool hovered = ImPlot::IsLegendEntryHovered(label_ids[i]) && ImHasFlag(spec.Flags, ImPlotPieChartFlags_Exploding);
22842284
if (sum > 0.0) {
22852285
ImU32 col = GetCurrentItem()->Color;
22862286
if (percent < 0.5) {
@@ -2342,7 +2342,7 @@ void PlotPieChart(const char* const label_ids[], const T* values, int count, dou
23422342
fmt((double)indexer[i], buffer, 32, fmt_data);
23432343
ImVec2 size = ImGui::CalcTextSize(buffer);
23442344
double angle = a0 + (a1 - a0) * 0.5;
2345-
const bool hovered = ImPlot::IsLegendEntryHovered(label_ids[i]) && ImHasFlag(flags, ImPlotPieChartFlags_Exploding);
2345+
const bool hovered = ImPlot::IsLegendEntryHovered(label_ids[i]) && ImHasFlag(spec.Flags, ImPlotPieChartFlags_Exploding);
23462346
const double offset = (hovered ? 0.6 : 0.5) * radius;
23472347
ImVec2 pos = PlotToPixels(center.x + offset * cos(angle), center.y + offset * sin(angle), IMPLOT_AUTO, IMPLOT_AUTO);
23482348
ImU32 col = CalcTextColor(ImGui::ColorConvertU32ToFloat4(item->Color));
@@ -2724,7 +2724,7 @@ void PlotDigitalEx(const char* label_id, Getter getter, const ImPlotSpec& spec)
27242724
int pixY_0 = (int)(s.Spec.LineWeight);
27252725
itemData1.y = ImMax(0.0, itemData1.y);
27262726
const float pixY_1 = s.Spec.Size * (float)itemData1.y;
2727-
const int pixY_chPosOffset = (int)(ImMax(s.Spec.Size, pixY_1) + s.Style.DigitalSpacing);
2727+
const int pixY_chPosOffset = (int)(ImMax(s.Spec.Size, pixY_1) + gp.Style.DigitalSpacing);
27282728
pixYMax = ImMax(pixYMax, pixY_chPosOffset);
27292729
ImVec2 pMin = PlotToPixels(itemData1,IMPLOT_AUTO,IMPLOT_AUTO);
27302730
ImVec2 pMax = PlotToPixels(itemData2,IMPLOT_AUTO,IMPLOT_AUTO);

0 commit comments

Comments
 (0)