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

Tear out most of the legacy code in the scenario editor - see below for details

Browse Source 
- All Carbon code is gone
- Many dialogs converted; some are still left unimplemented since they still need to be converted
- Menus converted to a xib file
- The giant arrays specifying the configuration of the special node dialog for each special node type have been replaced with maps and sets.

Changes to dialogs:
- pict choice dialog can now show picts of differing types; this was required for picking a monster graphic, as monsters of all sizes need to be shown in the same dialog
- string choice dialog can set the title, and properly shows the currently selected string
- LEDs now accept font format
- Fixed LED group's calculation of its rect
- Fixed LED group crashing if it has no selection
- Tabbing between text fields now works
- Fix display of larger monster graphics in dialogs
- Fix the script element content showing in the browser preview
This commit is contained in:
Celtic Minstrel
2014-07-12 22:13:27 -04:00
parent bbc9667c88
commit 41c3396aa3
80 changed files with 7983 additions and 4005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
osx/dialogxml/dialog.cpp
View File

@@ -146,49 +146,13 @@ template<> pair<string,cPict*> cDialog::parse(Element& who /*pict*/){
if(width > 0 || height > 0 || p.second->getPicType() == PIC_FULL){
frame.right = frame.left + width;
frame.bottom = frame.top + height;
}else switch(p.second->getPicType()){
case PIC_DLOG:
frame.right = frame.left + 36;
frame.bottom = frame.top + 36;
break;
case PIC_DLOG_LG:
frame.right = frame.left + 72;
frame.bottom = frame.top + 72;
break;
case PIC_SCEN:
case PIC_TALK:
frame.right = frame.left + 32;
frame.bottom = frame.top + 32;
break;
case PIC_SCEN_LG:
frame.right = frame.left + 64;
frame.bottom = frame.top + 64;
break;
case PIC_MISSILE:
frame.right = frame.left + 18;
frame.bottom = frame.top + 18;
break;
case PIC_TER_MAP:
frame.right = frame.left + 24;
frame.bottom = frame.top + 24;
break;
case PIC_STATUS:
frame.right = frame.left + 12;
frame.bottom = frame.top + 12;
break;
case PIC_FULL:
// TODO: Do some handling here to determine the sheet to use, and perhaps to load and set it.
break;
default:
frame.right = frame.left + 28;
frame.bottom = frame.top + 36;
break;
}
p.second->setBounds(frame);
pic_num_t wasPic = p.second->getPicNum();
if(custom) {
pic_num_t wasPic = p.second->getPicNum();
p.second->setPict(wasPic, p.second->getPicType() + PIC_CUSTOM);
}
} else p.second->setPict(wasPic, p.second->getPicType());
// The above line also sets the graphic's bounding rect, if necessary
if(p.first == ""){
do{
p.first = generateRandomString();
@@ -1032,20 +996,20 @@ void cDialog::run(){
// TODO: Tabbing through fields, and trigger focus events.
ctrlIter cur = controls.find(itemHit), iter;
if(!cur->second->triggerFocusHandler(*this,itemHit,true)) break;
cTextField* wasFocus = currentFocus;
iter = std::next(cur);
while(iter != cur){
if(typeid(iter->second) == typeid(cTextField*)){
if(iter->second->triggerFocusHandler(*this,iter->first,false)){
currentFocus = (cTextField*) iter->second;
if((currentFocus = dynamic_cast<cTextField*>(iter->second))){
if(currentFocus->triggerFocusHandler(*this,iter->first,false)){
itemHit = "";
break;
}
}
iter++;
if(iter == controls.end()) iter = controls.begin();
else iter++;
}
if(iter == cur) // no focus change occured!
; // TODO: Surely something should happen here?
currentFocus = wasFocus; // TODO: Surely something should happen here?
} else if(!key.spec || key.k != key_enter || mod_contains(key.mod, mod_alt)) {
dynamic_cast<cTextField*>(controls[itemHit])->handleInput(key);
itemHit = "";