From 805c9ff194d3fac267566aa08a7446bd90c4a440 Mon Sep 17 00:00:00 2001 From: hippoz <10706925-hippoz@users.noreply.gitlab.com> Date: Sat, 15 Oct 2022 00:55:54 +0300 Subject: [PATCH] fix name of row and column layout --- src/ColumnLayout.cpp | 2 +- src/ColumnLayout.hpp | 8 ++++---- src/RowLayout.cpp | 2 +- src/RowLayout.hpp | 8 ++++---- src/main.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ColumnLayout.cpp b/src/ColumnLayout.cpp index 45d3f89..2c40a9b 100644 --- a/src/ColumnLayout.cpp +++ b/src/ColumnLayout.cpp @@ -4,7 +4,7 @@ namespace Raven { -void VerticalBoxLayout::run() { +void ColumnLayout::run() { if (!m_target) { return; } diff --git a/src/ColumnLayout.hpp b/src/ColumnLayout.hpp index 19f87ff..681c491 100644 --- a/src/ColumnLayout.hpp +++ b/src/ColumnLayout.hpp @@ -4,14 +4,14 @@ namespace Raven { -class VerticalBoxLayout : public Layout { +class ColumnLayout : public Layout { private: double m_margin { 0.0 }; public: - VerticalBoxLayout() + ColumnLayout() : Layout() {} - VerticalBoxLayout(double margin) + ColumnLayout(double margin) : Layout() , m_margin(margin) {} @@ -20,7 +20,7 @@ public: double margin() { return m_margin; } void set_margin(double margin) { m_margin = margin; run(); } - virtual ~VerticalBoxLayout() {} + virtual ~ColumnLayout() {} }; } diff --git a/src/RowLayout.cpp b/src/RowLayout.cpp index 46802c8..d00ce36 100644 --- a/src/RowLayout.cpp +++ b/src/RowLayout.cpp @@ -4,7 +4,7 @@ namespace Raven { -void HorizontalBoxLayout::run() { +void RowLayout::run() { if (!m_target) { return; } diff --git a/src/RowLayout.hpp b/src/RowLayout.hpp index e0685af..673099d 100644 --- a/src/RowLayout.hpp +++ b/src/RowLayout.hpp @@ -4,14 +4,14 @@ namespace Raven { -class HorizontalBoxLayout : public Layout { +class RowLayout : public Layout { private: double m_margin { 0.0 }; public: - HorizontalBoxLayout() + RowLayout() : Layout() {} - HorizontalBoxLayout(double margin) + RowLayout(double margin) : Layout() , m_margin(margin) {} @@ -20,7 +20,7 @@ public: double margin() { return m_margin; } void set_margin(double margin) { m_margin = margin; run(); } - virtual ~HorizontalBoxLayout() {} + virtual ~RowLayout() {} }; } diff --git a/src/main.cpp b/src/main.cpp index b97faea..3305aa9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -32,7 +32,7 @@ int main() { auto list_view = main_widget->add(); auto content = main_widget->add(); - auto content_layout = content->set_layout(); + auto content_layout = content->set_layout(); content_layout->set_margin(6.0); content->set_style(&Raven::raised_widget_style);