mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Move text input window to UI module

Browse Source
This commit is contained in:
Marijn van der Werf
2017-10-23 00:36:59 +02:00
parent de6b3b4ebf
commit 59df233669
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/input/Input.cpp
View File

@@ -23,7 +23,7 @@
#include <openrct2/input.h>
#include <openrct2/interface/chat.h>
#include <openrct2/interface/console.h>
#include <openrct2/interface/window.h>
#include <openrct2-ui/windows/Window.h>
#include "KeyboardShortcuts.h"
#include "Input.h"

13
src/openrct2/windows/TextInput.cpp → src/openrct2-ui/windows/TextInput.cpp
View File

@@ -21,13 +21,14 @@
* that is used for inputing new text for ride names and peep names.
*/
#include "../config/Config.h"
#include "../Context.h"
#include "../core/Math.hpp"
#include <openrct2-ui/windows/Window.h>
#include "../interface/widget.h"
#include "../localisation/localisation.h"
#include "../util/util.h"
#include <openrct2/config/Config.h>
#include <openrct2/Context.h>
#include <openrct2/core/Math.hpp>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/util/util.h>
#define WW 250
#define WH 90

4
src/openrct2-ui/windows/Window.h
View File

@@ -125,3 +125,7 @@ void window_maze_construction_update_pressed_widgets();
rct_window * window_network_status_open(const char * text, close_callback onClose);
rct_window * window_network_status_open_password();
void window_network_status_close();
void window_text_input_key(rct_window * w, char keychar);
void window_text_input_open(rct_window * call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description, rct_string_id existing_text, uintptr_t existing_args, sint32 maxLength);
void window_text_input_raw_open(rct_window * call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description, utf8string existing_text, sint32 maxLength);

3
src/openrct2/interface/window.h
View File

@@ -691,7 +691,6 @@ void window_zoom_out(rct_window *w, bool atCursor);
void main_window_zoom(bool zoomIn, bool atCursor);
void window_show_textinput(rct_window *w, rct_widgetindex widgetIndex, uint16 title, uint16 text, sint32 value);
void window_text_input_key(rct_window* w, char keychar);
void window_draw_all(rct_drawpixelinfo *dpi, sint16 left, sint16 top, sint16 right, sint16 bottom);
void window_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 left, sint32 top, sint32 right, sint32 bottom);
@@ -726,8 +725,6 @@ void ride_construction_tooldown_construct(sint32 screenX, sint32 screenY);
void window_scenery_open();
void window_tile_inspector_open();
void window_tile_inspector_clear_clipboard();
void window_text_input_open(rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description, rct_string_id existing_text, uintptr_t existing_args, sint32 maxLength);
void window_text_input_raw_open(rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description, utf8string existing_text, sint32 maxLength);
rct_window * window_object_load_error_open(utf8 * path, size_t numMissingObjects, const rct_object_entry * missingObjects);