projects
/
winnie
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
raise works
[winnie]
/
src
/
window.cc
diff --git
a/src/window.cc
b/src/window.cc
index
59302d4
..
ab1e3e7
100644
(file)
--- a/
src/window.cc
+++ b/
src/window.cc
@@
-1,4
+1,5
@@
#include <algorithm>
#include <algorithm>
+#include <stdio.h> //TODO
#include <string.h>
#include "gfx.h"
#include <string.h>
#include "gfx.h"
@@
-90,10
+91,10
@@
void Window::invalidate()
wm->invalidate_region(abs_rect);
}
wm->invalidate_region(abs_rect);
}
-void Window::draw(const Rect &dirty_region)
+void Window::draw(Rect *dirty_region)
{
Rect abs_rect = get_absolute_rect();
{
Rect abs_rect = get_absolute_rect();
- Rect intersect = rect_intersection(abs_rect, dirty_region);
+ Rect intersect = rect_intersection(abs_rect, *dirty_region);
if(intersect.width && intersect.height) {
if(callbacks.display) {
callbacks.display(this);
if(intersect.width && intersect.height) {
if(callbacks.display) {
callbacks.display(this);
@@
-101,13
+102,15
@@
void Window::draw(const Rect &dirty_region)
dirty = false;
draw_children(abs_rect);
dirty = false;
draw_children(abs_rect);
+ *dirty_region = rect_union(*dirty_region, abs_rect);
}
}
void Window::draw_children(const Rect &dirty_region)
{
}
}
void Window::draw_children(const Rect &dirty_region)
{
+ Rect drect = dirty_region;
for(size_t i=0; i<children.size(); i++) {
for(size_t i=0; i<children.size(); i++) {
- children[i]->draw(dirty_region);
+ children[i]->draw(&drect);
}
}
}
}