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

Extended shift-v items menu #36663

Merged
merged 15 commits into from
Apr 2, 2020
Merged

Extended shift-v items menu #36663

Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e3bb1b3
Merge pull request #1 from CleverRaven/master
8street Dec 7, 2019
b5d17e9
Merge pull request #2 from CleverRaven/master
8street Dec 14, 2019
df84d2a
Merge branch 'master' of https://github.com/8street/Cataclysm-DDA
8street Dec 27, 2019
5c83410
Merge pull request #3 from CleverRaven/master
8street Dec 30, 2019
5830f7d
Merge remote-tracking branch 'upstream/master'
8street Dec 31, 2019
1f8163b
Merge remote-tracking branch 'upstream/master' into Extended-shift-v-…
8street Jan 3, 2020
2a86d7d
Editing game.cpp
8street Jan 3, 2020
20872b3
Some check change.
8street Jan 3, 2020
2131ac6
Clamp the width.
8street Jan 4, 2020
2367690
Merge pull request #9 from CleverRaven/master
8street Jan 5, 2020
03c162d
Merge pull request #10 from CleverRaven/master
8street Jan 6, 2020
29e2fa8
Merge remote-tracking branch 'upstream/master' into Extended-shift-v-…
8street Jan 8, 2020
6c72eba
Merge branch 'master' into Extended-shift-v-menu
8street Jan 8, 2020
e502f81
Resolving conflicts
8street Jan 8, 2020
3e361ca
Astyle
8street Jan 8, 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
18 changes: 15 additions & 3 deletions src/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7067,7 +7067,7 @@ bool game::take_screenshot( const std::string &path ) const
//helper method so we can keep list_items shorter
void game::reset_item_list_state( const catacurses::window &window, int height, bool bRadiusSort )
{
const int width = 44;
const int width = getmaxx( window );
for( int i = 1; i < TERMX; i++ ) {
if( i < width ) {
mvwputch( window, point( i, 0 ), c_light_gray, LINE_OXOX ); // -
Expand Down Expand Up @@ -7184,8 +7184,21 @@ void game::list_items_monsters()

game::vmenu_ret game::list_items( const std::vector<map_item_stack> &item_list )
{
std::vector<map_item_stack> ground_items = item_list;
int iInfoHeight = std::min( 25, TERMY / 2 );
const int width = 44;
int width = 44;

//find max length of item name and resize window width
for( const map_item_stack cur_item : ground_items ) {
8street marked this conversation as resolved.
Show resolved Hide resolved
const int item_len = utf8_width( remove_color_tags( cur_item.example->display_name() ) ) + 15;
if( item_len > width ) {
width = item_len;
}
}
if( width > TERMX - VIEW_OFFSET_X ) {
width = TERMX - VIEW_OFFSET_X;
}

const int offsetX = TERMX - VIEW_OFFSET_X - width;

catacurses::window w_items = catacurses::newwin( TERMY - 2 - iInfoHeight - VIEW_OFFSET_Y * 2,
Expand Down Expand Up @@ -7213,7 +7226,6 @@ game::vmenu_ret game::list_items( const std::vector<map_item_stack> &item_list )
uistate.list_item_init = true;
}

std::vector<map_item_stack> ground_items = item_list;
//this stores only those items that match our filter
std::vector<map_item_stack> filtered_items =
!sFilter.empty() ? filter_item_stacks( ground_items, sFilter ) : ground_items;
Expand Down