diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-01-19 02:03:39 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-01-19 02:03:39 +0300 |
| commit | c812ce5e14cf476526d955edbce2effa9d922902 (patch) | |
| tree | da67dc55e46efdd38a0647318977a342da730345 /src/Display | |
| parent | e0bbf71357b07c22e6d43be3cca5c7422163be32 (diff) | |
Major refactoring, bug fixes in function evaluation
Changed all bitmaps to use the bitmap class from RRFLibraries
Fixed bugs in functoin evaluation
Diffstat (limited to 'src/Display')
| -rw-r--r-- | src/Display/Menu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Display/Menu.cpp b/src/Display/Menu.cpp index 5c890e80..07870011 100644 --- a/src/Display/Menu.cpp +++ b/src/Display/Menu.cpp @@ -170,15 +170,15 @@ void Menu::DisplayMessageBox(const MessageBox& mbox) noexcept // Add whichever XYZ jog buttons we have been asked to display - assume only XYZ for now const PixelNumber axisButtonWidth = availableWidth/4; const PixelNumber axisButtonStep = (availableWidth - 3 *axisButtonWidth)/2 + axisButtonWidth; - if (IsBitSet(mbox.controls, X_AXIS)) + if (mbox.controls.IsBitSet(X_AXIS)) { AddItem(new ValueMenuItem(top + 2 * rowHeight, left, axisButtonWidth, MenuItem::CentreAlign, fontToUse, MenuItem::AlwaysVisible, true, 510, 1), true); } - if (IsBitSet(mbox.controls, Y_AXIS)) + if (mbox.controls.IsBitSet(Y_AXIS)) { AddItem(new ValueMenuItem(top + 2 * rowHeight, left + axisButtonStep, axisButtonWidth, MenuItem::CentreAlign, fontToUse, MenuItem::AlwaysVisible, true, 511, 1), true); } - if (IsBitSet(mbox.controls, Z_AXIS)) + if (mbox.controls.IsBitSet(Z_AXIS)) { AddItem(new ValueMenuItem(top + 2 * rowHeight, left + 2 * axisButtonStep, axisButtonWidth, MenuItem::CentreAlign, fontToUse, MenuItem::AlwaysVisible, true, 512, 2), true); } |