cpp/openttd-patchpack/source Changeset - r13426:509a5e9dc661

Changeset - r13426:509a5e9dc661

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

alberth - 15 years ago 2009-11-02 05:12:58
alberth@openttd.org

(svn r17945) -Fix (r17940): Absence of main toolbar and/or status bar should not be fatal.

1 file changed with 4 insertions and 4 deletions:

src/misc_gui.cpp

0 comments (0 inline, 0 general)

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -593,9 +593,9 @@ public: @@
 		 * Add a fixed distance 20 to make it less cluttered.
 		 */
 		const Window *w = FindWindowById(WC_MAIN_TOOLBAR, 0);
 		int scr_top = w->top + w->height + 20;
+		int scr_top = ((w != NULL) ? w->top + w->height : 0) + 20;
 		w = FindWindowById(WC_STATUS_BAR, 0);
 		int scr_bot = w->top - 20;
+		int scr_bot = ((w != NULL) ? w->top : _screen.height) - 20;
 		Point pt = RemapCoords2(this->position.x, this->position.y);
 		const ViewPort *vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport;
@@ @@ -810,9 +810,9 @@ struct TooltipsWindow : public Window @@
 		 * Add a fixed distance 2 so the tooltip floats free from both bars.
 		 */
 		const Window *w = FindWindowById(WC_MAIN_TOOLBAR, 0);
 		int scr_top = w->top + w->height + 2;
+		int scr_top = ((w != NULL) ? w->top + w->height : 0) + 2;
 		w = FindWindowById(WC_STATUS_BAR, 0);
 		int scr_bot = w->top - 2;
+		int scr_bot = ((w != NULL) ? w->top : _screen.height) - 2;
 		Point pt;

0 comments (0 inline, 0 general)