0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI2 Canvas: Draw rectangle fill before border

Browse source
This commit is contained in:
Celtic Minstrel 2017-04-08 18:29:17 -04:00
parent f016ed96f4
commit 508a493736
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/gui/core/canvas.cpp
View file

@ -792,20 +792,6 @@ void rectangle_shape::draw(surface& canvas,
surface_lock locker(canvas);
// Draw the border
for(int i = 0; i < border_thickness_; ++i) {
SDL_Rect dimensions {
x + i,
y + i,
w - (i * 2),
h - (i * 2)
};
set_renderer_color(renderer, border_color_);
SDL_RenderDrawRect(renderer, &dimensions);
}
// Fill the background, if applicable
if(!fill_color_.null() && w && h) {
set_renderer_color(renderer, fill_color_);
@ -819,6 +805,20 @@ void rectangle_shape::draw(surface& canvas,
SDL_RenderFillRect(renderer, &area);
}
// Draw the border
for(int i = 0; i < border_thickness_; ++i) {
SDL_Rect dimensions {
x + i,
y + i,
w - (i * 2),
h - (i * 2)
};
set_renderer_color(renderer, border_color_);
SDL_RenderDrawRect(renderer, &dimensions);
}
}
/***** ***** ***** ***** ***** Rounded Rectangle ***** ***** ***** ***** *****/