gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Fixes scoping for icons in GUI text, instead of using only the top page on the stack, which caused errors when dialog boxes popped up over text containing icons

Browse Source 
This was SVN commit r14591.
This commit is contained in:
historic_bruno
2014-01-17 02:54:57 +00:00
parent c39b541714
commit c094e72ede
5 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/CGUI.cpp
+4 -4
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2013 Wildfire Games.
/* Copyright (C) 2014 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -601,7 +601,7 @@ SGUIText CGUI::GenerateText(const CGUIString &string,
float prelim_line_height=0.f;
// Width and height of all text calls generated.
string.GenerateTextCall(Feedback, Font,
string.GenerateTextCall(this, Feedback, Font,
string.m_Words[i], string.m_Words[i+1],
FirstLine);
@@ -719,7 +719,7 @@ SGUIText CGUI::GenerateText(const CGUIString &string,
// Don't attach object, it'll suppress the errors
// we want them to be reported in the final GenerateTextCall()
// so that we don't get duplicates.
string.GenerateTextCall(Feedback2, Font,
string.GenerateTextCall(this, Feedback2, Font,
string.m_Words[j], string.m_Words[j+1],
FirstLine);
@@ -772,7 +772,7 @@ SGUIText CGUI::GenerateText(const CGUIString &string,
CGUIString::SFeedback Feedback2;
// Defaults
string.GenerateTextCall(Feedback2, Font,
string.GenerateTextCall(this, Feedback2, Font,
string.m_Words[j], string.m_Words[j+1],
FirstLine, pObject);