RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:27:44 +00:00
Code Issues Activity Actions

SharedGraphics: Tighten clip when blitting without alpha.

Browse source 
Also don't try to clean up the Painter's window backing store in ~Painter()
if we don't actually have a window backing store.
This commit is contained in:
Andreas Kling 2019-02-10 11:45:02 +01:00
parent 9860e55047
commit ddd580c30f
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
SharedGraphics/Painter.cpp
View file

@ -9,6 +9,8 @@
#include <LibGUI/GWindow.h> #include <LibGUI/GWindow.h>
#include <LibC/gui.h> #include <LibC/gui.h>
#include <LibC/stdio.h> #include <LibC/stdio.h>
#include <LibC/errno.h>
#include <LibC/string.h>
#endif #endif
#define DEBUG_WIDGET_UNDERDRAW #define DEBUG_WIDGET_UNDERDRAW
@ -28,9 +30,10 @@ Painter::Painter(GWidget& widget)
int rc = gui_get_window_backing_store(widget.window()->window_id(), &backing); int rc = gui_get_window_backing_store(widget.window()->window_id(), &backing);
if (rc < 0) { if (rc < 0) {
perror("gui_get_window_backing_store"); perror("gui_get_window_backing_store");
exit(1); ASSERT_NOT_REACHED();
} }
m_backing_store_id = backing.backing_store_id; m_backing_store_id = backing.backing_store_id;
m_target = GraphicsBitmap::create_wrapper(backing.size, backing.pixels); m_target = GraphicsBitmap::create_wrapper(backing.size, backing.pixels);
ASSERT(m_target); ASSERT(m_target);
m_window = widget.window(); m_window = widget.window();
@ -51,8 +54,13 @@ Painter::~Painter()
{ {
#ifdef USERLAND #ifdef USERLAND
m_target = nullptr; m_target = nullptr;
int rc = gui_release_window_backing_store(m_backing_store_id); if (m_backing_store_id) {
ASSERT(rc == 0); int rc = gui_release_window_backing_store(m_backing_store_id);
if (rc < 0) {
perror("gui_release_window_backing_store");
ASSERT_NOT_REACHED();
}
}
#endif #endif
} }
@ -281,7 +289,7 @@ void Painter::blit(const Point& position, const GraphicsBitmap& source, const Re
const unsigned src_skip = source.width(); const unsigned src_skip = source.width();
for (int row = first_row; row <= last_row; ++row) { for (int row = first_row; row <= last_row; ++row) {
fast_dword_copy(dst, src, dst_rect.width()); fast_dword_copy(dst, src, clipped_rect.width());
dst += dst_skip; dst += dst_skip;
src += src_skip; src += src_skip;
} }