sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix BoxLayout

This commit is contained in:
SirLynix 2022-08-01 12:57:30 +02:00 committed by Jérôme Leclercq
parent caa9d4c11e
commit 27dab13484
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/Nazara/Widgets/BoxLayout.hpp
View File

@ -7,14 +7,13 @@
#ifndef NAZARA_WIDGETS_BOXLAYOUT_HPP #ifndef NAZARA_WIDGETS_BOXLAYOUT_HPP
#define NAZARA_WIDGETS_BOXLAYOUT_HPP #define NAZARA_WIDGETS_BOXLAYOUT_HPP
#include <NDK/BaseWidget.hpp> #include <Nazara/Widgets/BaseWidget.hpp>
#include <NDK/ClientPrerequisites.hpp> #include <Nazara/Widgets/Enums.hpp>
#include <NDK/Widgets/Enums.hpp>
#include <memory> #include <memory>
namespace Nz namespace Nz
{ {
class NDK_CLIENT_API BoxLayout : public BaseWidget class NAZARA_WIDGETS_API BoxLayout : public BaseWidget
{ {
public: public:
BoxLayout(BaseWidget* parent, BoxLayoutOrientation orientation); BoxLayout(BaseWidget* parent, BoxLayoutOrientation orientation);
@ -36,6 +35,6 @@ namespace Nz
}; };
} }
#include <NDK/Widgets/BoxLayout.inl> #include <Nazara/Widgets/BoxLayout.inl>
#endif // NAZARA_WIDGETS_BOXLAYOUT_HPP #endif // NAZARA_WIDGETS_BOXLAYOUT_HPP

1
include/Nazara/Widgets/BoxLayout.inl
View File

@ -3,7 +3,6 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Widgets/BoxLayout.hpp> #include <Nazara/Widgets/BoxLayout.hpp>
#include <NDK/Widgets/BoxLayout.hpp>
#include <Nazara/Widgets/Debug.hpp> #include <Nazara/Widgets/Debug.hpp>
namespace Nz namespace Nz

11
src/Nazara/Widgets/BoxLayout.cpp
View File

@ -2,13 +2,10 @@
// This file is part of the "Nazara Engine - Widgets module" // This file is part of the "Nazara Engine - Widgets module"
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#if 0
#include <Nazara/Widgets/BoxLayout.hpp> #include <Nazara/Widgets/BoxLayout.hpp>
#include <Nazara/Core/Log.hpp> #include <Nazara/Core/Log.hpp>
#include <Nazara/Core/StackVector.hpp> #include <Nazara/Utils/StackVector.hpp>
#include <kiwi/kiwi.h> #include <kiwi/kiwi.h>
#include <NDK/Widgets/BoxLayout.hpp>
#include <cassert> #include <cassert>
#include <vector> #include <vector>
#include <Nazara/Widgets/Debug.hpp> #include <Nazara/Widgets/Debug.hpp>
@ -39,11 +36,11 @@ namespace Nz
switch (m_orientation) switch (m_orientation)
{ {
case BoxLayoutOrientation_Horizontal: case BoxLayoutOrientation::Horizontal:
axis = 0; //< x axis = 0; //< x
break; break;
case BoxLayoutOrientation_Vertical: case BoxLayoutOrientation::Vertical:
axis = 1; //< y axis = 1; //< y
break; break;
@ -138,5 +135,3 @@ namespace Nz
}); });
} }
} }
#endif

2
src/Nazara/Widgets/ScrollAreaWidget.cpp
View File

@ -3,8 +3,8 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Widgets/ScrollAreaWidget.hpp> #include <Nazara/Widgets/ScrollAreaWidget.hpp>
#include <Nazara/Widgets/ScrollbarWidget.hpp>
#include <Nazara/Math/Algorithm.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Widgets/ScrollbarWidget.hpp>
#include <Nazara/Widgets/Debug.hpp> #include <Nazara/Widgets/Debug.hpp>
namespace Nz namespace Nz