Skip to content

Commit

Permalink
fixing some clang-related errors
Browse files Browse the repository at this point in the history
  • Loading branch information
katemonster33 committed Apr 7, 2024
1 parent e124ab4 commit cfa27a8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
16 changes: 8 additions & 8 deletions src/cata_imgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -656,11 +656,11 @@ void cataimgui::window::clear_filter()
}
}

void cataimgui::window::set_filter( const std::string &filter )
{
// doesnt currently work, relies on API only available in newer ImGUi, because I can't have nice things
//ImGuiInputTextState* input_state = ImGui::GetInputTextState( p_impl->id );
//if( input_state ) {
// input_state->ReloadUserBufAndSelectAll();
//}
}
//void cataimgui::window::set_filter( const std::string &filter )
//{
// // doesnt currently work, relies on API only available in newer ImGUi, because I can't have nice things
// //ImGuiInputTextState* input_state = ImGui::GetInputTextState( p_impl->id );
// //if( input_state ) {
// // input_state->ReloadUserBufAndSelectAll();
// //}
//}
2 changes: 1 addition & 1 deletion src/cata_imgui.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class window
size_t str_width_to_pixels( size_t len );
size_t str_height_to_pixels( size_t len );
std::string get_filter();
void set_filter( const std::string &filter );
//void set_filter( const std::string &filter );
void clear_filter();
void mark_resized();

Expand Down
3 changes: 2 additions & 1 deletion src/input_context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1453,7 +1453,8 @@ action_id input_context::display_menu_imgui( const bool permit_execute_action )
break;
}
} else if( action == "TEXT.INPUT_FROM_FILE" ) {
kb_menu.set_filter( kb_menu.get_filter() + get_input_string_from_file() );
//kb_menu.set_filter( kb_menu.get_filter() + get_input_string_from_file() );
continue;
} else if( action == "HELP_KEYBINDINGS" ) {
// update available hotkeys in case they've changed
kb_menu.hotkeys = ctxt.get_available_single_char_hotkeys( display_help_hotkeys );
Expand Down

0 comments on commit cfa27a8

Please sign in to comment.