mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r18331) -Fix [FS#3334]: news items would with some chat 'bars' not be displayed fully. Fix by erikjanp.

release/1.0
rubidium 2009-11-29 00:41:08 +00:00
parent b00a5f1069
commit 5d38d06313
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/news_gui.cpp
View File

@ -287,7 +287,7 @@ struct NewsWindow : Window {
NewsWindow(const WindowDesc *desc, NewsItem *ni) : Window(), ni(ni) NewsWindow(const WindowDesc *desc, NewsItem *ni) : Window(), ni(ni)
{ {
NewsWindow::duration = 555; NewsWindow::duration = 555;
const Window *w = FindWindowById(WC_SEND_NETWORK_MSG, 0); const Window *w = FindWindowByClass(WC_SEND_NETWORK_MSG);
this->chat_height = (w != NULL) ? w->height : 0; this->chat_height = (w != NULL) ? w->height : 0;
this->status_height = FindWindowById(WC_STATUS_BAR, 0)->height; this->status_height = FindWindowById(WC_STATUS_BAR, 0)->height;

18
src/window.cpp
View File

@ -592,6 +592,22 @@ Window *FindWindowById(WindowClass cls, WindowNumber number)
return NULL; return NULL;
} }
/**
* Find any window by its class. Useful when searching for a window that uses
* the window number as a WindowType, like WC_SEND_NETWORK_MSG.
* @param cls Window class
* @return Pointer to the found window, or \c NULL if not available
*/
Window *FindWindowByClass(WindowClass cls)
{
Window *w;
FOR_ALL_WINDOWS_FROM_BACK(w) {
if (w->window_class == cls) return w;
}
return NULL;
}
/** /**
* Delete a window by its class and window number (if it is open). * Delete a window by its class and window number (if it is open).
* @param cls Window class * @param cls Window class
@ -807,7 +823,7 @@ void Window::InitializeData(WindowClass cls, int window_number, uint32 desc_flag
if (FindWindowById(WC_MAIN_TOOLBAR, 0) != NULL) w = w->z_back; if (FindWindowById(WC_MAIN_TOOLBAR, 0) != NULL) w = w->z_back;
if (FindWindowById(WC_STATUS_BAR, 0) != NULL) w = w->z_back; if (FindWindowById(WC_STATUS_BAR, 0) != NULL) w = w->z_back;
if (FindWindowById(WC_NEWS_WINDOW, 0) != NULL) w = w->z_back; if (FindWindowById(WC_NEWS_WINDOW, 0) != NULL) w = w->z_back;
if (FindWindowById(WC_SEND_NETWORK_MSG, 0) != NULL) w = w->z_back; if (FindWindowByClass(WC_SEND_NETWORK_MSG) != NULL) w = w->z_back;
if (w == NULL) { if (w == NULL) {
_z_back_window->z_front = this; _z_back_window->z_front = this;

1
src/window_func.h
View File

@ -16,6 +16,7 @@
#include "company_type.h" #include "company_type.h"
Window *FindWindowById(WindowClass cls, WindowNumber number); Window *FindWindowById(WindowClass cls, WindowNumber number);
Window *FindWindowByClass(WindowClass cls);
void ChangeWindowOwner(Owner old_owner, Owner new_owner); void ChangeWindowOwner(Owner old_owner, Owner new_owner);
void ResizeWindow(Window *w, int x, int y); void ResizeWindow(Window *w, int x, int y);