diff --git a/src/lib/score/graphics/GraphicsLayout.cpp b/src/lib/score/graphics/GraphicsLayout.cpp index 0ec1396e48..3ff172fe08 100644 --- a/src/lib/score/graphics/GraphicsLayout.cpp +++ b/src/lib/score/graphics/GraphicsLayout.cpp @@ -1,16 +1,18 @@ #include "GraphicsLayout.hpp" +#include #include #include #include - namespace score { GraphicsLayout::GraphicsLayout(QGraphicsItem* parent) : score::BackgroundItem{parent} , m_bg{nullptr} + , m_margin{default_margin} + , m_padding{default_padding} { } diff --git a/src/lib/score/graphics/GraphicsLayout.hpp b/src/lib/score/graphics/GraphicsLayout.hpp index 1f69d2a83b..584eac3d18 100644 --- a/src/lib/score/graphics/GraphicsLayout.hpp +++ b/src/lib/score/graphics/GraphicsLayout.hpp @@ -4,8 +4,6 @@ namespace score { struct BrushSet; -static constexpr const qreal default_margin = 5.; -static constexpr const qreal default_padding = 5.; class SCORE_LIB_BASE_EXPORT GraphicsLayout : public score::BackgroundItem { public: @@ -29,8 +27,8 @@ class SCORE_LIB_BASE_EXPORT GraphicsLayout : public score::BackgroundItem score::BrushSet* m_bg{}; QPixmap* m_pix{}; - qreal m_margin{default_margin}; - qreal m_padding{default_padding}; + qreal m_margin{}; + qreal m_padding{}; }; } diff --git a/src/lib/score/graphics/RectItem.cpp b/src/lib/score/graphics/RectItem.cpp index f4916736a3..b5e1cc569d 100644 --- a/src/lib/score/graphics/RectItem.cpp +++ b/src/lib/score/graphics/RectItem.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include diff --git a/src/lib/score/graphics/layouts/Constants.hpp b/src/lib/score/graphics/layouts/Constants.hpp new file mode 100644 index 0000000000..8b85bc759e --- /dev/null +++ b/src/lib/score/graphics/layouts/Constants.hpp @@ -0,0 +1,9 @@ +#pragma once +#include + +namespace score +{ +static constexpr const qreal default_margin = 0.; +static constexpr const qreal default_padding = 0.; + +} diff --git a/src/lib/score/graphics/layouts/GraphicsGridLayout.cpp b/src/lib/score/graphics/layouts/GraphicsGridLayout.cpp index 43b8c7b89c..3497d273eb 100644 --- a/src/lib/score/graphics/layouts/GraphicsGridLayout.cpp +++ b/src/lib/score/graphics/layouts/GraphicsGridLayout.cpp @@ -1,5 +1,7 @@ #include "GraphicsGridLayout.hpp" +#include + #include #include