(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
This commit is contained in:
		
							
								
								
									
										2
									
								
								gui.h
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gui.h
									
									
									
									
									
								
							@@ -124,7 +124,7 @@ extern const byte _fios_colors[];
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* network gui */
 | 
					/* network gui */
 | 
				
			||||||
void ShowNetworkGameWindow(void);
 | 
					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 */
 | 
					/* bridge_gui.c */
 | 
				
			||||||
void ShowBuildBridgeWindow(uint start, uint end, byte type);
 | 
					void ShowBuildBridgeWindow(uint start, uint end, byte type);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -332,7 +332,7 @@ void ShowNetworkChatQueryWindow(byte desttype, byte dest)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	_rename_id = desttype + (dest << 8);
 | 
						_rename_id = desttype + (dest << 8);
 | 
				
			||||||
	_rename_what = 2;
 | 
						_rename_what = 2;
 | 
				
			||||||
	ShowChatWindow(150, 338, 1, 0);
 | 
						ShowChatWindow(150, 1, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ShowNetworkGiveMoneyWindow(byte player)
 | 
					void ShowNetworkGiveMoneyWindow(byte player)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1545,7 +1545,7 @@ static const WindowDesc _chat_window_desc = {
 | 
				
			|||||||
	ChatWindowWndProc
 | 
						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;
 | 
						Window *w;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1561,7 +1561,7 @@ void ShowChatWindow(int maxlen, int maxwidth, WindowClass window_class, WindowNu
 | 
				
			|||||||
	WP(w,querystr_d).wnd_num = window_number;
 | 
						WP(w,querystr_d).wnd_num = window_number;
 | 
				
			||||||
	WP(w,querystr_d).text.caret = false;
 | 
						WP(w,querystr_d).text.caret = false;
 | 
				
			||||||
	WP(w,querystr_d).text.maxlength = maxlen;
 | 
						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;
 | 
						WP(w,querystr_d).text.buf = _edit_str_buf;
 | 
				
			||||||
	UpdateTextBufferSize(&WP(w, querystr_d).text);
 | 
						UpdateTextBufferSize(&WP(w, querystr_d).text);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user