From 59e8806c9efbf71251824903fd1c182928dbb4b4 Mon Sep 17 00:00:00 2001 From: hippoz <10706925-hippoz@users.noreply.gitlab.com> Date: Tue, 26 Jul 2022 01:05:21 +0300 Subject: [PATCH] clean up some of the imports --- src/BoxLayout.hpp | 6 +++--- src/Button.cpp | 1 + src/ScrollContainer.hpp | 2 +- src/main.cpp | 10 +++++----- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/BoxLayout.hpp b/src/BoxLayout.hpp index 37f3abe..cd923c4 100644 --- a/src/BoxLayout.hpp +++ b/src/BoxLayout.hpp @@ -1,8 +1,8 @@ #pragma once -#include "src/Layout.hpp" -#include "src/Widget.hpp" -#include "src/Box.hpp" +#include "Layout.hpp" +#include "Widget.hpp" +#include "Box.hpp" #include #include diff --git a/src/Button.cpp b/src/Button.cpp index fe675e2..1a88a66 100644 --- a/src/Button.cpp +++ b/src/Button.cpp @@ -30,6 +30,7 @@ void Button::on_paint() { auto painter = window()->painter(); painter.source_rgb(style()->foreground()); + // todo: do we use the max geometry like in Label? painter.text(rect(), m_text, PaintTextAlign::Center, PANGO_ELLIPSIZE_END, style()->font_description()); painter.fill(); } diff --git a/src/ScrollContainer.hpp b/src/ScrollContainer.hpp index 435ef52..08a992a 100644 --- a/src/ScrollContainer.hpp +++ b/src/ScrollContainer.hpp @@ -1,7 +1,7 @@ #pragma once #include "Widget.hpp" -#include "src/Point.hpp" +#include "Point.hpp" #include namespace Raven { diff --git a/src/main.cpp b/src/main.cpp index 803876b..c0b28b9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,10 +8,10 @@ #include "RGB.hpp" #include "DocumentLayout.hpp" #include "Events.hpp" -#include "src/BoxLayout.hpp" -#include "src/Box.hpp" -#include "src/ScrollContainer.hpp" -#include "src/Styles.hpp" +#include "BoxLayout.hpp" +#include "Box.hpp" +#include "ScrollContainer.hpp" +#include "Styles.hpp" #include #include #include @@ -24,7 +24,7 @@ protected: void on_paint() { if (!painter()) return; - painter()->png("tuna.png"); + //painter()->png("tuna.png"); painter()->cairo()->paint(); } };