gwm17/implot
1
0
Fork 0
mirror of https://github.com/gwm17/implot.git synced 2024-10-09 23:57:26 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'jaswantp-RecoverAxesLimits'

Browse Source
This commit is contained in:
epezent 2020-08-24 09:04:01 -05:00
parent 1b4a2049a7 9f851e700b
commit 8eb6bba63b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
implot.cpp
View File

@ -1308,6 +1308,7 @@ inline void ShowAxisContextMenu(ImPlotAxisState& state) {
bool grid = ImHasFlag(state.Axis->Flags, ImPlotAxisFlags_GridLines); bool grid = ImHasFlag(state.Axis->Flags, ImPlotAxisFlags_GridLines);
bool ticks = ImHasFlag(state.Axis->Flags, ImPlotAxisFlags_TickMarks); bool ticks = ImHasFlag(state.Axis->Flags, ImPlotAxisFlags_TickMarks);
bool labels = ImHasFlag(state.Axis->Flags, ImPlotAxisFlags_TickLabels); bool labels = ImHasFlag(state.Axis->Flags, ImPlotAxisFlags_TickLabels);
double drag_speed = (state.Axis->Range.Size() <= DBL_EPSILON) ? DBL_EPSILON * 1.0e+13 : 0.01 * state.Axis->Range.Size(); // recover from almost equal axis limits.
BeginDisabledControls(total_lock); BeginDisabledControls(total_lock);
if (ImGui::Checkbox("##LockMin", &state.LockMin)) if (ImGui::Checkbox("##LockMin", &state.LockMin))
@ -1316,7 +1317,8 @@ inline void ShowAxisContextMenu(ImPlotAxisState& state) {
ImGui::SameLine(); ImGui::SameLine();
BeginDisabledControls(state.LockMin); BeginDisabledControls(state.LockMin);
DragFloat("Min", &state.Axis->Range.Min, 0.01f * (float)state.Axis->Range.Size(), -HUGE_VAL, state.Axis->Range.Max - DBL_EPSILON); //DragFloat("Min", &state.Axis->Range.Min, 0.01f * (float)state.Axis->Range.Size(), -HUGE_VAL, state.Axis->Range.Max - DBL_EPSILON);
DragFloat("Min", &state.Axis->Range.Min, (float)drag_speed, -HUGE_VAL, state.Axis->Range.Max - DBL_EPSILON);
EndDisabledControls(state.LockMin); EndDisabledControls(state.LockMin);
BeginDisabledControls(total_lock); BeginDisabledControls(total_lock);
@ -1326,7 +1328,8 @@ inline void ShowAxisContextMenu(ImPlotAxisState& state) {
ImGui::SameLine(); ImGui::SameLine();
BeginDisabledControls(state.LockMax); BeginDisabledControls(state.LockMax);
DragFloat("Max", &state.Axis->Range.Max, 0.01f * (float)state.Axis->Range.Size(), state.Axis->Range.Min + DBL_EPSILON, HUGE_VAL); //DragFloat("Max", &state.Axis->Range.Max, 0.01f * (float)state.Axis->Range.Size(), state.Axis->Range.Min + DBL_EPSILON, HUGE_VAL);
DragFloat("Max", &state.Axis->Range.Max, (float)drag_speed, state.Axis->Range.Min + DBL_EPSILON, HUGE_VAL);
EndDisabledControls(state.LockMax); EndDisabledControls(state.LockMax);
ImGui::Separator(); ImGui::Separator();