meson.build

@@ -7,6 +7,7 @@ xlib_dep = dependency('x11')
 executable(
     'ravenapp',
     './src/Box.cpp',
+    './src/Events.cpp',
     './src/Widget.cpp',
     './src/Button.cpp',
     './src/Painter.cpp',

src/Box.cpp

@@ -3,15 +3,15 @@
 
 namespace Raven {
 
-bool Box::contains_point(double x, double y) const {
+bool Box::contains_point(double x, double y) {
     return x >= m_x && m_x + m_width >= x && y >= m_y && m_y + m_height >= y;
 }
 
-bool Box::contains_point(const Point &point) const {
+bool Box::contains_point(Point &point) {
     return point.get_x() >= m_x && m_x + m_width >= point.get_x() && point.get_y() >= m_y && m_y + m_height >= point.get_y();
 }
 
-bool Box::contains_box(const Box &other) const {
+bool Box::contains_box(Box &other) const {
     double ax1 = m_x;
     double ax2 = m_x + m_width;
     double ay1 = m_y;

src/Box.hpp

@@ -26,19 +26,14 @@ public:
     double get_width() { return m_width; }
     double get_height() { return m_height; }
 
-    double get_x() const { return m_x; }
-    double get_y() const { return m_y; }
-    double get_width() const { return m_width; }
-    double get_height() const { return m_height; }
-
     void set_x(double x) { m_x = x; }
     void set_y(double y) { m_y = y; }
     void set_width(double width) { m_width = width; }
     void set_height(double height) { m_height = height; }
 
-    bool contains_point(double x, double y) const;
-    bool contains_point(const Point &point) const;
-    bool contains_box(const Box &other) const;
+    bool contains_point(double x, double y);
+    bool contains_point(Point &point);
+    bool contains_box(Box &other) const;
 };
 
 }

src/Button.cpp

@@ -1,7 +1,8 @@
+#include <iostream>
 #include "Button.hpp"
 #include "Box.hpp"
 #include "Window.hpp"
-#include "Painter.hpp"
+#include "src/Painter.hpp"
 #include <pango/pangocairo.h>
 
 namespace Raven {

src/Painter.cpp

@@ -1,5 +1,5 @@
 #include "Painter.hpp"
-#include "RGB.hpp"
+#include "src/RGB.hpp"
 
 namespace Raven {
 

src/Painter.hpp

@@ -2,7 +2,7 @@
 
 #include "Box.hpp"
 #include "Point.hpp"
-#include "RGB.hpp"
+#include "src/RGB.hpp"
 #include <cairomm/cairomm.h>
 #include <pango/pangocairo.h>
 

src/Point.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <stdint.h>
+
 namespace Raven {
 
 class Point {

src/TopLevelStyles.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <iostream>
 #include "Forward.hpp"
 #include "pango/pango-font.h"
 #include "PropMacros.hpp"

src/Widget.cpp

@@ -1,3 +1,4 @@
+#include <iostream>
 #include <algorithm>
 #include "Widget.hpp"
 #include "Events.hpp"

src/Window.cpp

@@ -9,7 +9,7 @@
 
 #include "Window.hpp"
 #include "Events.hpp"
-#include "Point.hpp"
+#include "src/Point.hpp"
 
 namespace Raven {
 

src/main.cpp

@@ -1,3 +1,4 @@
+#include <iostream>
 #include "Window.hpp"
 #include "Widget.hpp"
 #include "Button.hpp"