From 9e682bb2f7d09e9b3c2380cd730322937e027e35 Mon Sep 17 00:00:00 2001 From: alberth Date: Sat, 1 Aug 2009 12:42:58 +0000 Subject: (svn r17022) -Codechange: Use nested widgets for the console window. --- src/console_gui.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/console_gui.cpp b/src/console_gui.cpp index 6ca976d0a..db862500d 100644 --- a/src/console_gui.cpp +++ b/src/console_gui.cpp @@ -143,18 +143,36 @@ static inline void IConsoleResetHistoryPos() {_iconsole_historypos = ICON_HISTOR static void IConsoleHistoryAdd(const char *cmd); static void IConsoleHistoryNavigate(int direction); +/** Widgets of the console window. */ +enum ConsoleWidgets { + CW_BACKGROUND, ///< Background of the console +}; + +static const struct NWidgetPart _nested_console_window_widgets[] = { + NWidget(WWT_EMPTY, INVALID_COLOUR, CW_BACKGROUND), SetResize(1, 1), +}; + +static const WindowDesc _console_window_desc( + 0, 0, 0, 0, 0, 0, + WC_CONSOLE, WC_NONE, + 0, + NULL, _nested_console_window_widgets, lengthof(_nested_console_window_widgets) +); + struct IConsoleWindow : Window { static int scroll; int line_height; int line_offset; - IConsoleWindow() : Window(0, 0, _screen.width, _screen.height / 3, WC_CONSOLE, NULL) + IConsoleWindow() : Window() { _iconsole_mode = ICONSOLE_OPENED; - this->line_height = FONT_HEIGHT_NORMAL + ICON_LINE_SPACING; this->line_offset = GetStringBoundingBox("] ").width + 5; + + this->InitNested(&_console_window_desc, 0); + ResizeWindow(this, _screen.width, _screen.height / 3); } ~IConsoleWindow() -- cgit v1.2.3-70-g09d2