cpp/openttd-patchpack/source Changeset - r15393:6dc0cb069557

Changeset - r15393:6dc0cb069557

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

alberth - 14 years ago 2010-07-02 13:59:27
alberth@openttd.org

(svn r20046) -Feature [FS#3816]: Wrap console lines when they are too long.

1 file changed with 9 insertions and 5 deletions:

src/console_gui.cpp

0 comments (0 inline, 0 general)

src/console_gui.cpp

➞

Show inline comments

@@ @@ -13,17 +13,20 @@ @@
 #include "textbuf_gui.h"
 #include "window_gui.h"
 #include "console_gui.h"
 #include "console_internal.h"
 #include "window_func.h"
 #include "string_func.h"
 #include "strings_func.h"
 #include "gfx_func.h"
 #include "settings_type.h"
 #include "console_func.h"
 #include "rev.h"
 #include "table/strings.h"
 static const uint ICON_HISTORY_SIZE       = 20;
 static const uint ICON_LINE_SPACING       =  2;
 static const uint ICON_RIGHT_BORDERWIDTH  = 10;
 static const uint ICON_BOTTOM_BORDERWIDTH = 12;
 /**
@@ @@ -171,13 +174,13 @@ struct IConsoleWindow : Window @@
 	int line_height;   ///< Height of one line of text in the console.
 	int line_offset;
 	IConsoleWindow() : Window()
+	{
 		_iconsole_mode = ICONSOLE_OPENED;
-		this->line_height = FONT_HEIGHT_NORMAL + ICON_LINE_SPACING;
 		this->line_height = FONT_HEIGHT_NORMAL;
 		this->line_offset = GetStringBoundingBox("] ").width + 5;
 		this->InitNested(&_console_window_desc, 0);
 		ResizeWindow(this, _screen.width, _screen.height / 3);
+	}
@@ @@ -185,19 +188,20 @@ struct IConsoleWindow : Window @@
+	{
 		_iconsole_mode = ICONSOLE_CLOSED;
+	}
 	virtual void OnPaint()
+	{
 		const int max = (this->height / this->line_height) - 1;
 		const int right = this->width - 5;
 		const IConsoleLine *print = IConsoleLine::Get(IConsoleWindow::scroll);
 		GfxFillRect(this->left, this->top, this->width, this->height - 1, 0);
 		for (int i = 0; i < max && print != NULL; i++, print = print->previous) {
 			DrawString(5, right, this->height - (2 + i) * this->line_height, print->buffer, print->colour, SA_LEFT | SA_FORCE);
 		int ypos = this->height - this->line_height - ICON_LINE_SPACING;
 		for (const IConsoleLine *print = IConsoleLine::Get(IConsoleWindow::scroll); print != NULL; print = print->previous) {
 			SetDParamStr(0, print->buffer);
 			ypos = DrawStringMultiLine(5, right, top, ypos, STR_JUST_RAW_STRING, print->colour, SA_LEFT | SA_BOTTOM | SA_FORCE) - ICON_LINE_SPACING;
 			if (ypos <= top) break;
+		}
 		/* If the text is longer than the window, don't show the starting ']' */
 		int delta = this->width - this->line_offset - _iconsole_cmdline.width - ICON_RIGHT_BORDERWIDTH;
 		if (delta > 0) {
 			DrawString(5, right, this->height - this->line_height, "]", (TextColour)CC_COMMAND, SA_LEFT | SA_FORCE);
 			delta = 0;

0 comments (0 inline, 0 general)