Pager and menu bar working together without interfering with each other

2013-10-11 01:14:02 +11:00
parent f64c935ffe
commit 871b1136c2
2 changed files with 58 additions and 21 deletions
@@ -27,6 +27,10 @@
 #include "region_pager.hpp"
 #include "tile_sheet.hpp"

+#include "image.hpp"
+#include "raster_font.hpp"
+#include "menu_bar.hpp"
+
 #include <list>

 class EditorScene : public BaseScene {
@@ -53,6 +57,11 @@ protected:
 	RegionPager pager;
 	std::list<TileSheet> sheetList;

+	RasterFont font;
+	Image buttonImage;
+
+	MenuBar menuBar;
+
 	struct {
 		int x = 0, y = 0;
 	} camera;