Compare commits

..

3 commits

Author SHA1 Message Date
hippoz
cf5bcd63b2
remove empty cpp file 2022-03-18 03:24:40 +02:00
hippoz
19abbbf057
make all Box methods const 2022-03-18 03:24:02 +02:00
hippoz
9c830c48d6
clean up includes a bit 2022-03-18 03:22:30 +02:00
12 changed files with 15 additions and 17 deletions

View file

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

View file

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

View file

@ -26,14 +26,19 @@ 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);
bool contains_point(Point &point);
bool contains_box(Box &other) const;
bool contains_point(double x, double y) const;
bool contains_point(const Point &point) const;
bool contains_box(const Box &other) const;
};
}

View file

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

View file

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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