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

41
osx/dialogxml/button.cpp
View File

@@ -16,6 +16,7 @@
#include "graphtool.h"
#include <cmath>
#include <climits>
#include "restypes.hpp"
@@ -229,12 +230,14 @@ bool cLed::triggerClickHandler(cDialog& me, std::string id, eKeyMod mods, locati
return result;
}
void cLed::setFormat(eFormat prop __attribute__((unused)), short val __attribute__((unused))) throw(xUnsupportedProp){
throw xUnsupportedProp(prop);
void cLed::setFormat(eFormat prop, short val) throw(xUnsupportedProp){
if(prop == TXT_FONT) textFont = (eFont) val;
else throw xUnsupportedProp(prop);
}
short cLed::getFormat(eFormat prop __attribute__((unused))) throw(xUnsupportedProp){
throw xUnsupportedProp(prop);
short cLed::getFormat(eFormat prop) throw(xUnsupportedProp){
if(prop == TXT_FONT) return textFont;
else throw xUnsupportedProp(prop);
}
void cLed::draw(){
@@ -277,16 +280,20 @@ cLedGroup::~cLedGroup(){
void cLedGroup::recalcRect(){
ledIter iter = choices.begin();
frame = {INT_MAX, INT_MAX, 0, 0};
while(iter != choices.end()){
RECT otherFrame = iter->second->getBounds();
if(otherFrame.right > frame.right)
frame.right = otherFrame.right;
if(otherFrame.bottom > frame.bottom)
frame.bottom = otherFrame.bottom;
if(otherFrame.left < frame.left)
frame.left = otherFrame.left;
if(otherFrame.top < frame.top)
frame.top = otherFrame.top;
iter++;
}
frame.right += 6;
frame.bottom += 6;
frame.inset(-6,-6);
}
/** A click handler is called whenever a click is received, even on the currently selected element. */
@@ -336,17 +343,21 @@ bool cLedGroup::triggerClickHandler(cDialog& me, std::string id, eKeyMod mods, l
if(choices[which_clicked]->triggerClickHandler(me,which_clicked,mods,where)){
eLedState a, b;
a = choices[curSelect]->getState();
b = choices[which_clicked]->getState();
choices[curSelect]->setState(led_off);
choices[which_clicked]->setState(led_red);
if(!choices[curSelect]->triggerFocusHandler(me,curSelect,true)){
choices[curSelect]->setState(a);
choices[which_clicked]->setState(b);
return false;
if(curSelect.empty()) a = led_off;
else {
a = choices[curSelect]->getState();
choices[curSelect]->setState(led_off);
if(!choices[curSelect]->triggerFocusHandler(me,curSelect,true)){
choices[curSelect]->setState(a);
choices[which_clicked]->setState(b);
return false;
}
}
b = choices[which_clicked]->getState();
choices[which_clicked]->setState(led_red);
if(!choices[which_clicked]->triggerFocusHandler(me,which_clicked,false)){
choices[curSelect]->setState(a);
if(!curSelect.empty())
choices[curSelect]->setState(a);
choices[which_clicked]->setState(b);
return false;
}