cpp/openttd-patchpack/source Changeset - r3467:6bc1d5601bb8

Changeset - r3467:6bc1d5601bb8

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

tron - 18 years ago 2006-04-07 08:57:03
tron@openttd.org

(svn r4312) Calculate the maximum pixel width of the entered text in the chat box from the "text box"-widget instead of hardcoding an arbitrary - and wrong - number

3 files changed with 4 insertions and 4 deletions:

gui.h

main_gui.c

network_gui.c

0 comments (0 inline, 0 general)

gui.h

➞

Show inline comments

@@ @@ -124,7 +124,7 @@ extern const byte _fios_colors[]; @@
 /* network gui */
 void ShowNetworkGameWindow(void);
-void ShowChatWindow(int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number);
 void ShowChatWindow(int maxlen, WindowClass window_class, WindowNumber window_number);
 /* bridge_gui.c */
 void ShowBuildBridgeWindow(uint start, uint end, byte type);

main_gui.c

➞

Show inline comments

@@ @@ -332,7 +332,7 @@ void ShowNetworkChatQueryWindow(byte des @@
+{
 	_rename_id = desttype + (dest << 8);
 	_rename_what = 2;
-	ShowChatWindow(150, 338, 1, 0);
 	ShowChatWindow(150, 1, 0);
+}
 void ShowNetworkGiveMoneyWindow(byte player)

network_gui.c

➞

Show inline comments

@@ @@ -1545,7 +1545,7 @@ static const WindowDesc _chat_window_des @@
 	ChatWindowWndProc
 };
-void ShowChatWindow(int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number)
 void ShowChatWindow(int maxlen, WindowClass window_class, WindowNumber window_number)
+{
 	Window *w;
@@ @@ -1561,7 +1561,7 @@ void ShowChatWindow(int maxlen, int maxw @@
 	WP(w,querystr_d).wnd_num = window_number;
 	WP(w,querystr_d).text.caret = false;
 	WP(w,querystr_d).text.maxlength = maxlen;
-	WP(w,querystr_d).text.maxwidth = maxwidth;
+	WP(w,querystr_d).text.maxwidth = w->widget[1].right - w->widget[1].left - 2; // widget[1] is the "text box"
 	WP(w,querystr_d).text.buf = _edit_str_buf;
 	UpdateTextBufferSize(&WP(w, querystr_d).text);
+}

0 comments (0 inline, 0 general)