openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix custom dialogs having the wrong background and default text colours

Browse Source
This commit is contained in:
Celtic Minstrel
2014-04-12 14:38:17 -04:00
parent dac305b1eb
commit 904eb389c5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osx/dialogxml/dlogutil.cpp
View File

@@ -231,18 +231,24 @@ bool cChoiceDlog::onClick(cDialog& me, std::string id){
cThreeChoice::cThreeChoice cThreeChoice::cThreeChoice
(std::vector<std::string>& strings, std::array<cBasicButtonType, 3>& buttons, pic_num_t pic, ePicType t, cDialog* parent) (std::vector<std::string>& strings, std::array<cBasicButtonType, 3>& buttons, pic_num_t pic, ePicType t, cDialog* parent)
: cChoiceDlog(parent), type(t){ : cChoiceDlog(parent), type(t){
cDialog& parentDlog = *operator->();
parentDlog.setBg(cDialog::BG_DARK);
parentDlog.setDefTextClr(sf::Color::White);
if(type == PIC_CUSTOM_DLOG_LG || type == PIC_DLOG_LG || type == PIC_SCEN_LG) if(type == PIC_CUSTOM_DLOG_LG || type == PIC_DLOG_LG || type == PIC_SCEN_LG)
init_strings(strings,86); init_strings(strings,86);
else else
init_strings(strings,50); init_strings(strings,50);
init_buttons(buttons[1], buttons[2], buttons[3]); init_buttons(buttons[1], buttons[2], buttons[3]);
init_pict(pic); init_pict(pic);
operator->()->recalcRect(); parentDlog.recalcRect();
} }
cThreeChoice::cThreeChoice cThreeChoice::cThreeChoice
(std::vector<std::string>& strings,std::array<short, 3>& buttons,pic_num_t pic,ePicType t,cDialog* parent) (std::vector<std::string>& strings,std::array<short, 3>& buttons,pic_num_t pic,ePicType t,cDialog* parent)
: cChoiceDlog(parent), type(t){ : cChoiceDlog(parent), type(t){
cDialog& parentDlog = *operator->();
parentDlog.setBg(cDialog::BG_DARK);
parentDlog.setDefTextClr(sf::Color::White);
if(type == PIC_CUSTOM_DLOG_LG || type == PIC_DLOG_LG || type == PIC_SCEN_LG) if(type == PIC_CUSTOM_DLOG_LG || type == PIC_DLOG_LG || type == PIC_SCEN_LG)
init_strings(strings,86); init_strings(strings,86);
else else
@@ -255,7 +261,7 @@ cThreeChoice::cThreeChoice
} }
init_buttons(buttonDefs[0], buttonDefs[1], buttonDefs[2]); init_buttons(buttonDefs[0], buttonDefs[1], buttonDefs[2]);
init_pict(pic); init_pict(pic);
operator->()->recalcRect(); parentDlog.recalcRect();
} }
void cThreeChoice::init_strings(std::vector<std::string>& strings, unsigned short left){ void cThreeChoice::init_strings(std::vector<std::string>& strings, unsigned short left){