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

Fix construction menu filtering and a few other tweaks #37549

Merged
merged 2 commits into from
Jan 31, 2020
Merged

Fix construction menu filtering and a few other tweaks #37549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5814d96
Fix construction menu filtering and a few other tweaks
Qrox Jan 30, 2020
ff7aba9
Merge branch 'master' into construction-tweaks
ZhilkinSerg Jan 31, 2020
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
62 changes: 37 additions & 25 deletions src/construction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,6 @@ construction_id construction_menu( const bool blueprint )
draw_grid( w_con, w_list_width + w_list_x0 );

construction_id ret( -1 );
std::vector<construction_category> construct_cat;
construct_cat = construction_categories::get_all();

bool update_info = true;
bool update_cat = true;
Expand Down Expand Up @@ -318,18 +316,27 @@ construction_id construction_menu( const bool blueprint )
ctxt.register_action( "QUIT" );
ctxt.register_action( "HELP_KEYBINDINGS" );
ctxt.register_action( "FILTER" );
ctxt.register_action( "RESET_FILTER" );

static const int tabcount = static_cast<int>( construction_category::count() );
const std::vector<construction_category> &construct_cat = construction_categories::get_all();
const int tabcount = static_cast<int>( construction_category::count() );

std::string filter;
int previous_index = 0;
do {
if( update_cat ) {
update_cat = false;
category_id = construction_categories::get_all()[tabindex].id;
cata::optional<std::string> last_construction;
if( isnew ) {
filter = uistate.construction_filter;
tabindex = uistate.construction_tab.is_valid()
? uistate.construction_tab.id().to_i() : 0;
last_construction = uistate.last_construction;
} else if( select >= 0 && static_cast<size_t>( select ) < constructs.size() ) {
last_construction = constructs[select];
}
category_id = construct_cat[tabindex].id;
if( category_id == "ALL" ) {
constructs = available;
previous_index = tabindex;
} else if( category_id == "FILTER" ) {
constructs.clear();
previous_select = -1;
Expand All @@ -340,16 +347,14 @@ construction_id construction_menu( const bool blueprint )
} );
} else {
constructs = cat_available[category_id];
previous_index = tabindex;
}
if( isnew ) {
if( !uistate.last_construction.empty() ) {
select = std::distance( constructs.begin(),
std::find( constructs.begin(),
constructs.end(),
uistate.last_construction ) );
select = 0;
if( last_construction ) {
const auto it = std::find( constructs.begin(), constructs.end(),
*last_construction );
if( it != constructs.end() ) {
select = std::distance( constructs.begin(), it );
}
filter = uistate.construction_filter;
}
}
isnew = false;
Expand Down Expand Up @@ -382,6 +387,10 @@ construction_id construction_menu( const bool blueprint )
}

std::vector<std::string> notes;
if( tabindex == tabcount - 1 && !filter.empty() ) {
notes.push_back( string_format( _( "Press %s to clear filter" ),
ctxt.get_desc( "RESET_FILTER" ) ) );
}
notes.push_back( string_format( _( "Press %s or %s to tab." ), ctxt.get_desc( "LEFT" ),
ctxt.get_desc( "RIGHT" ) ) );
notes.push_back( string_format( _( "Press %s to search." ), ctxt.get_desc( "FILTER" ) ) );
Expand Down Expand Up @@ -601,24 +610,28 @@ construction_id construction_menu( const bool blueprint )

const std::string action = ctxt.handle_input();
if( action == "FILTER" ) {
string_input_popup()
string_input_popup popup;
popup
.title( _( "Search" ) )
.width( 50 )
.description( _( "Filter" ) )
.max_length( 100 )
.edit( filter );
if( !filter.empty() ) {
.text( tabindex == tabcount - 1 ? filter : std::string() )
.query();
if( popup.confirmed() ) {
filter = popup.text();
uistate.construction_filter = filter;
update_info = true;
update_cat = true;
tabindex = tabcount - 1;
select = 0;
} else if( previous_index != tabcount - 1 ) {
tabindex = previous_index;
}
} else if( action == "RESET_FILTER" ) {
if( tabindex == tabcount - 1 && !filter.empty() ) {
filter.clear();
uistate.construction_filter.clear();
update_info = true;
update_cat = true;
select = 0;
}
uistate.construction_filter = filter;
} else if( action == "DOWN" ) {
update_info = true;
if( select < static_cast<int>( constructs.size() ) - 1 ) {
Expand All @@ -636,15 +649,13 @@ construction_id construction_menu( const bool blueprint )
} else if( action == "LEFT" ) {
update_info = true;
update_cat = true;
select = 0;
tabindex--;
if( tabindex < 0 ) {
tabindex = tabcount - 1;
}
} else if( action == "RIGHT" ) {
update_info = true;
update_cat = true;
select = 0;
tabindex = ( tabindex + 1 ) % tabcount;
} else if( action == "PAGE_UP" ) {
update_info = true;
Expand All @@ -670,7 +681,6 @@ construction_id construction_menu( const bool blueprint )
update_info = true;
update_cat = true;
hide_unconstructable = !hide_unconstructable;
select = 0;
offset = 0;
load_available_constructions( available, cat_available, hide_unconstructable );
} else if( action == "CONFIRM" ) {
Expand Down Expand Up @@ -706,6 +716,8 @@ construction_id construction_menu( const bool blueprint )
}
} while( !exit );

uistate.construction_tab = int_id<construction_category>( tabindex ).id();

w_list = catacurses::window();
w_con = catacurses::window();
g->refresh_all();
Expand Down
24 changes: 24 additions & 0 deletions src/construction_category.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,30 @@ const construction_category &string_id<construction_category>::obj() const
return all_construction_categories.obj( *this );
}

template<>
int_id<construction_category> string_id<construction_category>::id() const
{
return all_construction_categories.convert( *this, int_id<construction_category>( -1 ) );
}

template<>
bool int_id<construction_category>::is_valid() const
{
return all_construction_categories.is_valid( *this );
}

template<>
const construction_category &int_id<construction_category>::obj() const
{
return all_construction_categories.obj( *this );
}

template<>
const string_id<construction_category> &int_id<construction_category>::id() const
{
return all_construction_categories.convert( *this );
}

void construction_category::load( const JsonObject &jo, const std::string & )
{
mandatory( jo, was_loaded, "name", name );
Expand Down
2 changes: 1 addition & 1 deletion src/string_id_null_ids.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ MAKE_NULL_ID2( oter_t, "", 0 )
MAKE_NULL_ID2( oter_type_t, "", 0 )
MAKE_NULL_ID2( ter_t, "t_null", 0 )
MAKE_NULL_ID2( trap, "tr_null" )
MAKE_NULL_ID2( construction_category, "NULL", 0 )
MAKE_NULL_ID2( construction_category, "NULL", -1 )
MAKE_NULL_ID2( ammo_effect, "AE_NULL", 0 )
MAKE_NULL_ID2( field_type, "fd_null", 0 )
MAKE_NULL_ID2( furn_t, "f_null", 0 )
Expand Down
4 changes: 3 additions & 1 deletion src/uistate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <vector>

#include "enums.h"
#include "optional.h"
#include "omdata.h"
#include "type_id.h"

Expand Down Expand Up @@ -80,7 +81,8 @@ class uistatedata

// construction menu selections
std::string construction_filter;
std::string last_construction;
cata::optional<std::string> last_construction;
construction_category_id construction_tab = construction_category_id::NULL_ID();

// overmap editor selections
const oter_t *place_terrain = nullptr;
Expand Down