From 3cfdb4e0c101b67dfe6d0d86174d8ed691ad9b28 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 11 Nov 2018 09:04:20 +0100 Subject: Sorted out zoomout, works for all now --- gui/fpgaviewwidget.h | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'gui/fpgaviewwidget.h') diff --git a/gui/fpgaviewwidget.h b/gui/fpgaviewwidget.h index 8c0ad609..3c0cfbbd 100644 --- a/gui/fpgaviewwidget.h +++ b/gui/fpgaviewwidget.h @@ -240,21 +240,6 @@ class FPGAViewWidget : public QOpenGLWidget, protected QOpenGLFunctions QColor highlight[8]; } colors_; - // Flags that are passed through from renderer arguments to renderer data. - // These are used by the UI code to signal events that will only fire when - // the next frame gets rendered. - struct PassthroughFlags - { - bool zoomOutbound; - - PassthroughFlags() : zoomOutbound(false) {} - PassthroughFlags &operator=(const PassthroughFlags &other) noexcept - { - zoomOutbound = other.zoomOutbound; - return *this; - } - }; - struct RendererArgs { // Decals that he user selected. @@ -268,12 +253,12 @@ class FPGAViewWidget : public QOpenGLWidget, protected QOpenGLFunctions // Whether to render grid or skip it. bool gridChanged; - // Flags to pass back into the RendererData. - PassthroughFlags flags; + // Flags for rendering. + bool zoomOutbound; // Hint text std::string hintText; // cursor pos - int x,y; + int x, y; }; std::unique_ptr rendererArgs_; QMutex rendererArgsLock_; @@ -291,8 +276,6 @@ class FPGAViewWidget : public QOpenGLWidget, protected QOpenGLFunctions PickQuadTree::BoundingBox bbSelected; // Quadtree for picking objects. std::unique_ptr qt; - // Flags from args. - PassthroughFlags flags; }; std::unique_ptr rendererData_; QMutex rendererDataLock_; -- cgit v1.2.3