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

Compare commits

base: gwm17:d34204b5a762dcef600440f8d7502633626cd217
Branches Tags
gwm17:master
gwm17:backends
gwm17:features/item-flags
gwm17:features/neg-time
gwm17:features/prevplot
gwm17:features/tooltips
gwm17:v0.12
gwm17:v0.11
gwm17:v0.10
gwm17:v0.9
gwm17:v0.8
gwm17:v0.7
gwm17:v0.6
gwm17:v0.5
gwm17:v0.4
gwm17:v0.3
gwm17:v0.2
gwm17:v0.1
...
compare: gwm17:8250340f04fe86174a75544e73a759cedcb658f3
Branches Tags
gwm17:backends
gwm17:master
gwm17:features/item-flags
gwm17:features/neg-time
gwm17:features/prevplot
gwm17:features/tooltips
gwm17:v0.12
gwm17:v0.11
gwm17:v0.10
gwm17:v0.9
gwm17:v0.8
gwm17:v0.7
gwm17:v0.6
gwm17:v0.5
gwm17:v0.4
gwm17:v0.3
gwm17:v0.2
gwm17:v0.1

3 Commits
d34204b5a7 ... 8250340f04

Author SHA1 Message Date
Gordon McCann 8250340f04 Fix another ImGuiKeyMod thing 2022-11-08 14:03:54 -05:00
Gordon McCann 2fcf81af78 Fix ImGuiKeyModFlags -> ImGuiModFlags 2022-11-08 14:00:05 -05:00
Gordon McCann 6d3e3bb418 Fix Drag utils to work with updated ImGui (as done in commits to master) 2022-11-08 13:48:40 -05:00
3 changed files with 30 additions and 25 deletions
Show Stats Expand all files Collapse all files

29
implot.cpp
View File

@ -619,6 +619,7 @@ bool ShowLegendEntries(ImPlotItemGroup& items, const ImRect& legend_bb, bool hov
ImRect button_bb(icon_bb.Min, label_bb.Max); ImRect button_bb(icon_bb.Min, label_bb.Max);
ImGui::KeepAliveID(item->ID);
bool item_hov = false; bool item_hov = false;
bool item_hld = false; bool item_hld = false;
@ -3684,6 +3685,7 @@ bool DragPoint(int n_id, double* x, double* y, const ImVec4& col, float radius,
ImRect rect(pos.x-grab_half_size,pos.y-grab_half_size,pos.x+grab_half_size,pos.y+grab_half_size); ImRect rect(pos.x-grab_half_size,pos.y-grab_half_size,pos.x+grab_half_size,pos.y+grab_half_size);
bool hovered = false, held = false; bool hovered = false, held = false;
ImGui::KeepAliveID(id);
if (input) if (input)
ImGui::ButtonBehavior(rect,id,&hovered,&held); ImGui::ButtonBehavior(rect,id,&hovered,&held);
@ -3728,6 +3730,7 @@ bool DragLineX(int n_id, double* value, const ImVec4& col, float thickness, ImPl
ImRect rect(x-grab_half_size,yt,x+grab_half_size,yb); ImRect rect(x-grab_half_size,yt,x+grab_half_size,yb);
bool hovered = false, held = false; bool hovered = false, held = false;
ImGui::KeepAliveID(id);
if (input) if (input)
ImGui::ButtonBehavior(rect,id,&hovered,&held); ImGui::ButtonBehavior(rect,id,&hovered,&held);
@ -3779,6 +3782,7 @@ bool DragLineY(int n_id, double* value, const ImVec4& col, float thickness, ImPl
ImRect rect(xl,y-grab_half_size,xr,y+grab_half_size); ImRect rect(xl,y-grab_half_size,xr,y+grab_half_size);
bool hovered = false, held = false; bool hovered = false, held = false;
ImGui::KeepAliveID(id);
if (input) if (input)
ImGui::ButtonBehavior(rect,id,&hovered,&held); ImGui::ButtonBehavior(rect,id,&hovered,&held);
@ -3849,6 +3853,7 @@ bool DragRect(int n_id, double* x_min, double* y_min, double* x_max, double* y_m
bool hovered = false, held = false; bool hovered = false, held = false;
ImRect b_rect(pc.x-DRAG_GRAB_HALF_SIZE,pc.y-DRAG_GRAB_HALF_SIZE,pc.x+DRAG_GRAB_HALF_SIZE,pc.y+DRAG_GRAB_HALF_SIZE); ImRect b_rect(pc.x-DRAG_GRAB_HALF_SIZE,pc.y-DRAG_GRAB_HALF_SIZE,pc.x+DRAG_GRAB_HALF_SIZE,pc.y+DRAG_GRAB_HALF_SIZE);
ImGui::KeepAliveID(id);
if (input) if (input)
ImGui::ButtonBehavior(b_rect,id,&hovered,&held); ImGui::ButtonBehavior(b_rect,id,&hovered,&held);
@ -4490,32 +4495,32 @@ ImPlotInputMap& GetInputMap() {
void MapInputDefault(ImPlotInputMap* dst) { void MapInputDefault(ImPlotInputMap* dst) {
ImPlotInputMap& map = dst ? *dst : GetInputMap(); ImPlotInputMap& map = dst ? *dst : GetInputMap();
map.Pan = ImGuiMouseButton_Left; map.Pan = ImGuiMouseButton_Left;
map.PanMod = ImGuiKeyModFlags_None; map.PanMod = ImGuiModFlags_None;
map.Fit = ImGuiMouseButton_Left; map.Fit = ImGuiMouseButton_Left;
map.Menu = ImGuiMouseButton_Right; map.Menu = ImGuiMouseButton_Right;
map.Select = ImGuiMouseButton_Right; map.Select = ImGuiMouseButton_Right;
map.SelectMod = ImGuiKeyModFlags_None; map.SelectMod = ImGuiModFlags_None;
map.SelectCancel = ImGuiMouseButton_Left; map.SelectCancel = ImGuiMouseButton_Left;
map.SelectHorzMod = ImGuiKeyModFlags_Alt; map.SelectHorzMod = ImGuiModFlags_Alt;
map.SelectVertMod = ImGuiKeyModFlags_Shift; map.SelectVertMod = ImGuiModFlags_Shift;
map.OverrideMod = ImGuiKeyModFlags_Ctrl; map.OverrideMod = ImGuiModFlags_Ctrl;
map.ZoomMod = ImGuiKeyModFlags_None; map.ZoomMod = ImGuiModFlags_None;
map.ZoomRate = 0.1f; map.ZoomRate = 0.1f;
} }
void MapInputReverse(ImPlotInputMap* dst) { void MapInputReverse(ImPlotInputMap* dst) {
ImPlotInputMap& map = dst ? *dst : GetInputMap(); ImPlotInputMap& map = dst ? *dst : GetInputMap();
map.Pan = ImGuiMouseButton_Right; map.Pan = ImGuiMouseButton_Right;
map.PanMod = ImGuiKeyModFlags_None; map.PanMod = ImGuiModFlags_None;
map.Fit = ImGuiMouseButton_Left; map.Fit = ImGuiMouseButton_Left;
map.Menu = ImGuiMouseButton_Right; map.Menu = ImGuiMouseButton_Right;
map.Select = ImGuiMouseButton_Left; map.Select = ImGuiMouseButton_Left;
map.SelectMod = ImGuiKeyModFlags_None; map.SelectMod = ImGuiModFlags_None;
map.SelectCancel = ImGuiMouseButton_Right; map.SelectCancel = ImGuiMouseButton_Right;
map.SelectHorzMod = ImGuiKeyModFlags_Alt; map.SelectHorzMod = ImGuiModFlags_Alt;
map.SelectVertMod = ImGuiKeyModFlags_Shift; map.SelectVertMod = ImGuiModFlags_Shift;
map.OverrideMod = ImGuiKeyModFlags_Ctrl; map.OverrideMod = ImGuiModFlags_Ctrl;
map.ZoomMod = ImGuiKeyModFlags_None; map.ZoomMod = ImGuiModFlags_None;
map.ZoomRate = 0.1f; map.ZoomRate = 0.1f;
} }

14
implot.h
View File

@ -397,16 +397,16 @@ struct ImPlotStyle {
// Input mapping structure. Default values listed. See also MapInputDefault, MapInputReverse. // Input mapping structure. Default values listed. See also MapInputDefault, MapInputReverse.
struct ImPlotInputMap { struct ImPlotInputMap {
ImGuiMouseButton Pan; // LMB enables panning when held, ImGuiMouseButton Pan; // LMB enables panning when held,
ImGuiKeyModFlags PanMod; // none optional modifier that must be held for panning/fitting ImGuiModFlags PanMod; // none optional modifier that must be held for panning/fitting
ImGuiMouseButton Fit; // LMB initiates fit when double clicked ImGuiMouseButton Fit; // LMB initiates fit when double clicked
ImGuiMouseButton Select; // RMB begins box selection when pressed and confirms selection when released ImGuiMouseButton Select; // RMB begins box selection when pressed and confirms selection when released
ImGuiMouseButton SelectCancel; // LMB cancels active box selection when pressed; cannot be same as Select ImGuiMouseButton SelectCancel; // LMB cancels active box selection when pressed; cannot be same as Select
ImGuiKeyModFlags SelectMod; // none optional modifier that must be held for box selection ImGuiModFlags SelectMod; // none optional modifier that must be held for box selection
ImGuiKeyModFlags SelectHorzMod; // Alt expands active box selection horizontally to plot edge when held ImGuiModFlags SelectHorzMod; // Alt expands active box selection horizontally to plot edge when held
ImGuiKeyModFlags SelectVertMod; // Shift expands active box selection vertically to plot edge when held ImGuiModFlags SelectVertMod; // Shift expands active box selection vertically to plot edge when held
ImGuiMouseButton Menu; // RMB opens context menus (if enabled) when clicked ImGuiMouseButton Menu; // RMB opens context menus (if enabled) when clicked
ImGuiKeyModFlags OverrideMod; // Ctrl when held, all input is ignored; used to enable axis/plots as DND sources ImGuiModFlags OverrideMod; // Ctrl when held, all input is ignored; used to enable axis/plots as DND sources
ImGuiKeyModFlags ZoomMod; // none optional modifier that must be held for scroll wheel zooming ImGuiModFlags ZoomMod; // none optional modifier that must be held for scroll wheel zooming
float ZoomRate; // 0.1f zoom rate for scroll (e.g. 0.1f = 10% plot range every scroll click); make negative to invert float ZoomRate; // 0.1f zoom rate for scroll (e.g. 0.1f = 10% plot range every scroll click); make negative to invert
IMPLOT_API ImPlotInputMap(); IMPLOT_API ImPlotInputMap();
}; };
@ -863,7 +863,7 @@ IMPLOT_API bool BeginDragDropTargetLegend();
IMPLOT_API void EndDragDropTarget(); IMPLOT_API void EndDragDropTarget();
// NB: By default, plot and axes drag and drop *sources* require holding the Ctrl modifier to initiate the drag. // NB: By default, plot and axes drag and drop *sources* require holding the Ctrl modifier to initiate the drag.
// You can change the modifier if desired. If ImGuiKeyModFlags_None is provided, the axes will be locked from panning. // You can change the modifier if desired. If ImGuiModFlags_None is provided, the axes will be locked from panning.
// Turns the current plot's plotting area into a drag and drop source. You must hold Ctrl. Don't forget to call EndDragDropSource! // Turns the current plot's plotting area into a drag and drop source. You must hold Ctrl. Don't forget to call EndDragDropSource!
IMPLOT_API bool BeginDragDropSourcePlot(ImGuiDragDropFlags flags = 0); IMPLOT_API bool BeginDragDropSourcePlot(ImGuiDragDropFlags flags = 0);

12
implot_demo.cpp
View File

@ -226,16 +226,16 @@ void ButtonSelector(const char* label, ImGuiMouseButton* b) {
ImGui::PopID(); ImGui::PopID();
} }
void ModSelector(const char* label, ImGuiKeyModFlags* k) { void ModSelector(const char* label, ImGuiModFlags* k) {
ImGui::PushID(label); ImGui::PushID(label);
ImGui::CheckboxFlags("Ctrl", (unsigned int*)k, ImGuiKeyModFlags_Ctrl); ImGui::SameLine(); ImGui::CheckboxFlags("Ctrl", (unsigned int*)k, ImGuiModFlags_Ctrl); ImGui::SameLine();
ImGui::CheckboxFlags("Shift", (unsigned int*)k, ImGuiKeyModFlags_Shift); ImGui::SameLine(); ImGui::CheckboxFlags("Shift", (unsigned int*)k, ImGuiModFlags_Shift); ImGui::SameLine();
ImGui::CheckboxFlags("Alt", (unsigned int*)k, ImGuiKeyModFlags_Alt); ImGui::SameLine(); ImGui::CheckboxFlags("Alt", (unsigned int*)k, ImGuiModFlags_Alt); ImGui::SameLine();
ImGui::CheckboxFlags("Super", (unsigned int*)k, ImGuiKeyModFlags_Super); ImGui::CheckboxFlags("Super", (unsigned int*)k, ImGuiModFlags_Super);
ImGui::PopID(); ImGui::PopID();
} }
void InputMapping(const char* label, ImGuiMouseButton* b, ImGuiKeyModFlags* k) { void InputMapping(const char* label, ImGuiMouseButton* b, ImGuiModFlags* k) {
ImGui::LabelText("##","%s",label); ImGui::LabelText("##","%s",label);
if (b != NULL) { if (b != NULL) {
ImGui::SameLine(100); ImGui::SameLine(100);