RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:57:35 +00:00
Code Issues Activity Actions

Window contents move along with the window!

Browse source
This commit is contained in:
Andreas Kling 2018-10-12 02:41:27 +02:00
parent 64127e0637
commit 6f6f9bd84d
10 changed files with 48 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Widgets/Painter.cpp
View file

@ -2,6 +2,7 @@
#include "FrameBufferSDL.h"
#include "Widget.h"
#include "Font.h"
#include "Window.h"
#include <AK/Assertions.h>
#include <SDL.h>
@ -9,6 +10,14 @@ Painter::Painter(Widget& widget)
: m_widget(widget)
, m_font(Font::defaultFont())
{
if (auto* window = widget.window()) {
printf("window :: %s\n", window->title().characters());
m_translation.setX(window->x());
m_translation.setY(window->y());
} else {
m_translation.setX(widget.x());
m_translation.setY(widget.y());
}
}
Painter::~Painter()
@ -26,7 +35,7 @@ static dword* scanline(int y)
void Painter::fillRect(const Rect& rect, Color color)
{
Rect r = rect;
r.moveBy(m_widget.x(), m_widget.y());
r.moveBy(m_translation);
for (int y = r.top(); y < r.bottom(); ++y) {
dword* bits = scanline(y);
@ -39,7 +48,7 @@ void Painter::fillRect(const Rect& rect, Color color)
void Painter::drawRect(const Rect& rect, Color color)
{
Rect r = rect;
r.moveBy(m_widget.x(), m_widget.y());
r.moveBy(m_translation);
for (int y = r.top(); y < r.bottom(); ++y) {
dword* bits = scanline(y);
@ -57,7 +66,7 @@ void Painter::drawRect(const Rect& rect, Color color)
void Painter::xorRect(const Rect& rect, Color color)
{
Rect r = rect;
r.moveBy(m_widget.x(), m_widget.y());
r.moveBy(m_translation);
for (int y = r.top(); y < r.bottom(); ++y) {
dword* bits = scanline(y);
@ -79,12 +88,12 @@ void Painter::drawText(const Rect& rect, const String& text, TextAlignment align
if (alignment == TextAlignment::TopLeft) {
point = rect.location();
point.moveBy(m_widget.x(), m_widget.y());
point.moveBy(m_translation);
} else if (alignment == TextAlignment::Center) {
int textWidth = text.length() * m_font.glyphWidth();
point = rect.center();
point.moveBy(-(textWidth / 2), -(m_font.glyphWidth() / 2));
point.moveBy(m_widget.x(), m_widget.y());
point.moveBy(m_translation);
} else {
ASSERT_NOT_REACHED();
}