Skip to content

Commit

Permalink
Revert "Merge pull request CleverRaven#72318 from Brambor/imgui-no-de…
Browse files Browse the repository at this point in the history
…lay"

This reverts commit ef537eb, reversing
changes made to 22a7030.
  • Loading branch information
SurFlurer committed Mar 19, 2024
1 parent 9503dac commit c84d08c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/input.h
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ class input_manager
void wait_for_any_key();

/**
* Sets global input polling timeout in milliseconds as appropriate for the current interface system.
* Sets global input polling timeout as appropriate for the current interface system.
* Use `input_context::(re)set_timeout()` when possible so timeout will be properly
* reset when entering a new input context.
*/
Expand Down
1 change: 0 additions & 1 deletion src/input_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ class input_context
*
* If the action is mouse input, returns "MOUSE".
*
* @param timeout in milliseconds.
* @return One of the input actions formerly registered with
* `register_action()`, or "ERROR" if an error happened.
*
Expand Down
2 changes: 1 addition & 1 deletion src/main_menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void demo_ui::run()

while( is_open ) {
ui_manager::redraw();
action = ctxt.handle_input( 5 );
action = ctxt.handle_input();
if( action == "QUIT" ) {
break;
}
Expand Down

0 comments on commit c84d08c

Please sign in to comment.