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

Jump to bottom

More scrollbars #65767

Merged
merged 2 commits into from
May 22, 2023
Merged

More scrollbars #65767

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
c14b4bd
ui: add scrollbar to trait description (character info screen)
dseguin May 20, 2023
de3bf3b
ui: add scrollbar to trait description (mutation ui)
dseguin May 20, 2023
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
14 changes: 14 additions & 0 deletions data/raw/keybindings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2080,6 +2080,20 @@
"name": "Toggle activate/examine",
"bindings": [ { "input_method": "keyboard_char", "key": "!" }, { "input_method": "keyboard_code", "key": "1", "mod": [ "shift" ] } ]
},
{
"type": "keybinding",
"id": "SCROLL_TRAIT_INFO_UP",
"category": "MUTATIONS",
"name": "Scroll mutation info up",
"bindings": [ { "input_method": "keyboard_char", "key": "<" }, { "input_method": "keyboard_code", "key": ",", "mod": [ "shift" ] } ]
},
{
"type": "keybinding",
"id": "SCROLL_TRAIT_INFO_DOWN",
"category": "MUTATIONS",
"name": "Scroll mutation info down",
"bindings": [ { "input_method": "keyboard_char", "key": ">" }, { "input_method": "keyboard_code", "key": ".", "mod": [ "shift" ] } ]
},
{
"type": "keybinding",
"id": "APPLY",
Expand Down
35 changes: 30 additions & 5 deletions src/mutation_ui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ void avatar::power_mutations()
int second_column = 0;

int scroll_position = 0;
int examine_pos = 0;
int cursor = 0;
int max_scroll_position = 0;
int list_height = 0;
Expand Down Expand Up @@ -199,6 +200,7 @@ void avatar::power_mutations()
point( START.x + 1, TITLE_START_Y ) );

recalc_max_scroll_position();
examine_pos = 0;

// X-coordinate of the list of active mutations
second_column = 32 + ( TERMX - FULL_SCREEN_WIDTH ) / 4;
Expand All @@ -215,6 +217,8 @@ void avatar::power_mutations()
ctxt.register_action( "REASSIGN" );
ctxt.register_action( "NEXT_TAB" );
ctxt.register_action( "PREV_TAB" );
ctxt.register_action( "SCROLL_TRAIT_INFO_UP" );
ctxt.register_action( "SCROLL_TRAIT_INFO_DOWN" );
ctxt.register_action( "CONFIRM" );
ctxt.register_action( "HELP_KEYBINDINGS" );
ctxt.register_action( "QUIT" );
Expand Down Expand Up @@ -337,13 +341,23 @@ void avatar::power_mutations()

draw_scrollbar( wBio, scroll_position, list_height, mutations_count,
point( 0, list_start_y ), c_white, true );
wnoutrefresh( wBio );
show_mutations_titlebar( w_title, menu_mode, ctxt );

if( menu_mode == mutation_menu_mode::examining && examine_id.has_value() ) {
werase( w_description );
fold_and_print( w_description, point_zero, WIDTH - 2, c_light_blue,
mutation_desc( examine_id.value() ) );
std::vector<std::string> desc = foldstring( mutation_desc( examine_id.value() ), WIDTH - 2 );
const int winh = catacurses::getmaxy( w_description );
const bool do_scroll = desc.size() > static_cast<unsigned>( std::abs( winh ) );
const int fline = do_scroll ? examine_pos % ( desc.size() + 1 - winh ) : 0;
const int lline = do_scroll ? fline + winh : desc.size();
for( int i = fline; i < lline; i++ ) {
trim_and_print( w_description, point( 0, i - fline ), WIDTH - 2, c_light_blue, desc[i] );
}
draw_scrollbar( wBio, fline, winh, desc.size(), point( 0, catacurses::getmaxy( wBio ) - winh - 1 ),
c_white, true );
}
wnoutrefresh( wBio );
show_mutations_titlebar( w_title, menu_mode, ctxt );
if( menu_mode == mutation_menu_mode::examining && examine_id.has_value() ) {
wnoutrefresh( w_description );
}
} );
Expand Down Expand Up @@ -474,6 +488,7 @@ void avatar::power_mutations()
if( scroll_position > 0 && cursor - scroll_position < half_list_view_location ) {
scroll_position = std::max( cursor - half_list_view_location, 0 );
}
examine_pos = 0;

// Draw the description, shabby workaround
examine_id = GetTrait( active, passive, cursor, tab_mode );
Expand Down Expand Up @@ -502,8 +517,12 @@ void avatar::power_mutations()
std::max( std::min<int>( lim + 1 - list_height,
cursor - half_list_view_location ), 0 );
}
examine_pos = 0;

examine_id = GetTrait( active, passive, cursor, tab_mode );
} else if( ( action == "SCROLL_TRAIT_INFO_UP" || action == "SCROLL_TRAIT_INFO_DOWN" ) &&
menu_mode == mutation_menu_mode::examining ) {
examine_pos += action == "SCROLL_TRAIT_INFO_UP" ? -1 : 1;
} else if( action == "NEXT_TAB" || action == "PREV_TAB" ) {
if( tab_mode == mutation_tab_mode::active && !passive.empty() ) {
tab_mode = mutation_tab_mode::passive;
Expand All @@ -513,6 +532,7 @@ void avatar::power_mutations()
continue;
}
scroll_position = 0;
examine_pos = 0;
cursor = 0;
examine_id = GetTrait( active, passive, cursor, tab_mode );
} else if( action == "CONFIRM" ) {
Expand Down Expand Up @@ -616,7 +636,12 @@ void avatar::power_mutations()
// switches between activation and examination
menu_mode = menu_mode == mutation_menu_mode::activating ?
mutation_menu_mode::examining : mutation_menu_mode::activating;
examine_id = std::nullopt;
if( menu_mode == mutation_menu_mode::examining ) {
examine_id = GetTrait( active, passive, cursor, tab_mode );
} else {
examine_id = std::nullopt;
}
examine_pos = 0;
} else if( action == "TOGGLE_SPRITE" ) {
menu_mode = mutation_menu_mode::hiding;
examine_id = std::nullopt;
Expand Down
21 changes: 16 additions & 5 deletions src/player_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,14 +632,25 @@ static void draw_traits_tab( ui_adaptor &ui, const catacurses::window &w_traits,
}

static void draw_traits_info( const catacurses::window &w_info, const unsigned line,
const std::vector<trait_and_var> &traitslist )
const std::vector<trait_and_var> &traitslist, const unsigned info_line )
{
werase( w_info );
if( line < traitslist.size() ) {
const trait_and_var &cur = traitslist[line];
// NOLINTNEXTLINE(cata-use-named-point-constants)
fold_and_print( w_info, point( 1, 0 ), FULL_SCREEN_WIDTH - 2, c_light_gray, string_format( "%s: %s",
colorize( cur.name(), cur.trait->get_display_color() ), cur.desc() ) );
std::vector<std::string> desc =
foldstring( string_format( "%s: %s", colorize( cur.name(), cur.trait->get_display_color() ),
cur.desc() ), FULL_SCREEN_WIDTH - 3 );
const int winh = catacurses::getmaxy( w_info );
const bool do_scroll = desc.size() > static_cast<unsigned>( std::abs( winh ) );
const int fline = do_scroll ? info_line % ( desc.size() + 1 - winh ) : 0;
const int lline = do_scroll ? fline + winh : desc.size();
for( int i = fline; i < lline; i++ ) {
trim_and_print( w_info, point( 1, i - fline ), FULL_SCREEN_WIDTH - 3, c_light_gray, desc[i] );
}
if( do_scroll ) {
draw_scrollbar( w_info, fline, winh, desc.size(), point( FULL_SCREEN_WIDTH - 3, 0 ), c_white,
true );
}
}
wnoutrefresh( w_info );
}
Expand Down Expand Up @@ -1057,7 +1068,7 @@ static void draw_info_window( const catacurses::window &w_info, const Character
draw_skills_info( w_info, you, line, skillslist );
break;
case player_display_tab::traits:
draw_traits_info( w_info, line, traitslist );
draw_traits_info( w_info, line, traitslist, info_line );
break;
case player_display_tab::bionics:
draw_bionics_info( w_info, line, bionicslist );
Expand Down
Loading