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

Make GUI2 windows honor the restore flag passed to show()

Browse source 
This introduces a new field, restore_, which is set from the show()
method. When it is set to false it stops the draw() and undraw()
function from blitting the cached value onto the screen.
This commit is contained in:
Andreas Löf 2016-02-05 20:25:33 +13:00
parent b73cc895ae
commit 5819a3e78d
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gui/widgets/window.cpp
View file

@ -316,6 +316,7 @@ twindow::twindow(CVideo& video,
, variables_()
, invalidate_layout_blocked_(false)
, suspend_drawing_(true)
, restore_(true)
, restorer_()
, automatic_placement_(automatic_placement)
, horizontal_placement_(horizontal_placement)
@ -596,6 +597,7 @@ int twindow::show(const bool restore, const unsigned auto_close_timeout)
tip::remove();
show_mode_ = modal;
restore_ = restore;
/**
* Helper class to set and restore the drawing interval.
@ -702,7 +704,7 @@ int twindow::show(const bool restore, const unsigned auto_close_timeout)
suspend_drawing_ = true;
// restore area
if(restore) {
if(restore_) {
SDL_Rect rect = get_rectangle();
sdl_blit(restorer_, 0, video_.getSurface(), &rect);
update_rect(get_rectangle());
@ -718,7 +720,7 @@ int twindow::show(const bool restore, const unsigned auto_close_timeout)
suspend_drawing_ = true;
// restore area
if(restore) {
if(restore_) {
SDL_Rect rect = get_rectangle();
sdl_blit(restorer_, 0, video_.getSurface(), &rect);
update_rect(get_rectangle());
@ -747,7 +749,7 @@ void twindow::draw()
// Restore old surface. In the future this phase will not be needed
// since all will be redrawn when needed with dirty rects. Since that
// doesn't work yet we need to undraw the window.
if(restorer_) {
if(restore_ && restorer_) {
SDL_Rect rect = get_rectangle();
sdl_blit(restorer_, 0, frame_buffer, &rect);
// Since the old area might be bigger as the new one, invalidate
@ -766,7 +768,9 @@ void twindow::draw()
#else
font::draw_floating_labels(frame_buffer);
#endif
restorer_ = get_surface_portion(frame_buffer, rect);
if(restore_) {
restorer_ = get_surface_portion(frame_buffer, rect);
}
// Need full redraw so only set ourselves dirty.
dirty_list_.push_back(std::vector<twidget*>(1, this));
@ -869,8 +873,10 @@ void twindow::draw()
}
// Restore.
SDL_Rect rect = get_rectangle();
sdl_blit(restorer_, 0, frame_buffer, &rect);
if(restore_) {
SDL_Rect rect = get_rectangle();
sdl_blit(restorer_, 0, frame_buffer, &rect);
}
// Background.
for(std::vector<twidget*>::iterator itor = item.begin();
@ -909,7 +915,7 @@ void twindow::draw()
void twindow::undraw()
{
if(restorer_) {
if(restore_ && restorer_) {
SDL_Rect rect = get_rectangle();
sdl_blit(restorer_, 0, video_.getSurface(), &rect);
// Since the old area might be bigger as the new one, invalidate

3
src/gui/widgets/window.hpp
View file

@ -494,6 +494,9 @@ private:
/** Avoid drawing the window. */
bool suspend_drawing_;
/** Whether the window should undraw the window using restorer_ */
bool restore_;
/** When the window closes this surface is used to undraw the window. */
surface restorer_;