Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refresh main menu windows after drawing #36380

Merged
merged 1 commit into from Dec 23, 2019
+5 −0
Merged

Refresh main menu windows after drawing #36380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2691,6 +2691,7 @@ std::string options_manager::show( bool ingame, const bool world_options_only )
// keybinding screen erased the internal borders of main menu, restore it:
draw_borders_internal( w_options_header, mapLines );
} else if( action == "QUIT" ) {
catacurses::clear();
catacurses::refresh();
break;
}
Expand Down
4 changes: 4 additions & 0 deletions src/worldfactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ WORLDPTR worldfactory::pick_world( bool show_prompt )
const std::string action = ctxt.handle_input();

if( action == "QUIT" ) {
catacurses::clear();
catacurses::refresh();
break;
} else if( !world_pages[selpage].empty() && action == "DOWN" ) {
Expand Down Expand Up @@ -757,6 +758,7 @@ void worldfactory::show_active_world_mods( const std::vector<mod_id> &world_mods
}

} else if( action == "QUIT" || action == "CONFIRM" ) {
catacurses::clear();
catacurses::refresh();
break;
}
Expand Down Expand Up @@ -1164,13 +1166,15 @@ int worldfactory::show_worldgen_tab_confirm( const catacurses::window &win, WORL
if( !valid_worldname( world->world_name ) ) {
continue;
}
catacurses::clear();
catacurses::refresh();
return 1;
}
} else if( query_yn( _( "Are you SURE you're finished?" ) ) ) {
// erase entire window to avoid overlapping of query with possible popup about invalid worldname
werase( w_confirmation );
wrefresh( w_confirmation );
catacurses::clear();
catacurses::refresh();

if( valid_worldname( worldname ) ) {
Expand Down