Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch from a virtal method to an event handler for re-generating the window's pattern. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6020 4a71c877-e1ca-e34f-864e-861f7616d084
master
Freddie Witherden 2008-09-14 13:49:37 +00:00
parent 9d7a8e8d43
commit 26444e8e07
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/betawidget/window.c
View File

@ -51,9 +51,6 @@ static void windowInitVtbl(window *self)
vtbl.widgetVtbl.getMinSize = windowGetMinSizeImpl;
vtbl.widgetVtbl.getMaxSize = windowGetMaxSizeImpl;
vtbl.widgetVtbl.resize = windowResizeImpl;
initialised = true;
}
@ -80,14 +77,29 @@ static void windowCreateWindowPattern(window *self, int w, int h)
cairo_pattern_add_color_stop_rgba(self->windowPattern, 1, 0.176470, 0.176470, 0.372549, 0.7);
}
static bool windowResizePatternCallback(widget *self, const event *evt,
int handlerId, void *userData)
{
// Make sure this is a resize event
assert(evt->type == EVT_RESIZE);
// Re-create the window pattern
windowCreateWindowPattern(WINDOW(self), self->size.x, self->size.y);
return true;
}
void windowInit(window *self, const char *id, int w, int h)
{
// Init our parent
widgetInit(WIDGET(self), id);
// Patterns initialization
// Patterns initialisation
self->windowPattern = NULL;
windowCreateWindowPattern(self, w, h);
// Ensure the pattern is re-created whenever we are resized
widgetAddEventHandler(WIDGET(self), EVT_RESIZE, windowResizePatternCallback,
NULL, NULL);
// Prepare our vtable
windowInitVtbl(self);
@ -197,7 +209,6 @@ void windowDoDrawImpl(widget *self)
cairo_fill(cr);
}
void windowDoDrawMaskImpl(widget *self)
{
// Get the mask context
@ -225,13 +236,6 @@ size windowGetMaxSizeImpl(widget *self)
return maxSize;
}
void windowResizeImpl(widget *self, int w, int h)
{
windowCreateWindowPattern(WINDOW(self), w, h);
widgetResizeImpl(self, w, h);
}
void windowSetWindowVector(vector *v)
{
// Make sure the vector is valid

1
lib/betawidget/window.h
View File

@ -77,7 +77,6 @@ void windowDoDrawMaskImpl(widget *self);
bool windowAddChildImpl(widget *self, widget *child);
size windowGetMinSizeImpl(widget *self);
size windowGetMaxSizeImpl(widget *self);
void windowResizeImpl(widget *self, int w, int h);
/*
* Public static methods