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

Update About Blades of Exile dialog

Browse Source 
- Some text in this update contributed by ADoS

Also:
- Make scroll panes scroll 5 pixels per click instead of 1
- Make scroll pane page size depend on the height
This commit is contained in:
Celtic Minstrel
2015-10-02 18:46:21 -04:00
parent a455941d92
commit 5f7654046d
3 changed files with 59 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/boe.main.cpp
View File

@@ -600,8 +600,10 @@ void handle_menu_choice(eMenu item_hit) {
give_help(212,0);
break;
}
if(!dialogToShow.empty())
cChoiceDlog(dialogToShow).show();
if(!dialogToShow.empty()) {
cChoiceDlog dlog(dialogToShow);
dlog.show();
}
}
// TODO: Let this function take a cMonster* instead of the item_hit

12
src/dialogxml/scrollpane.cpp
View File

@@ -59,8 +59,8 @@ void cScrollPane::recalcRect() {
globalFrame.inset(-4,-4);
frame.left = globalFrame.left;
frame.right = globalFrame.right;
scroll.setMaximum(globalFrame.height() - frame.height());
scroll.setPageSize(100);
scroll.setMaximum((globalFrame.height() - frame.height()) / 5);
scroll.setPageSize((frame.height() - 5) / 5);
rectangle scrollFrame;
scrollFrame.left = frame.right;
scrollFrame.top = frame.top;
@@ -143,7 +143,7 @@ void cScrollPane::draw() {
for(auto& ctrl : contents) {
rectangle localBounds = ctrl.second->getBounds();
rectangle globalBounds = localBounds;
globalBounds.offset(0, -scroll.getPosition());
globalBounds.offset(0, -5 * scroll.getPosition());
ctrl.second->setBounds(globalBounds);
ctrl.second->draw();
ctrl.second->setBounds(localBounds);
@@ -184,14 +184,14 @@ std::string cScrollPane::parse(ticpp::Element& who, std::string fname) {
if(!foundTop) throw xMissingAttr("pane","top",who.Row(),who.Column(),fname);
if(!foundLeft) throw xMissingAttr("pane","left",who.Row(),who.Column(),fname);
if(width > 0) {
frame.right = frame.left + width;
frame.width() = width;
}else{
throw xMissingAttr("pane","width",who.Row(),who.Column(),fname);
}
if(height > 0) {
frame.bottom = frame.top + height;
frame.height() = height;
}else{
frame.bottom = frame.top + 10;
frame.height() = 10;
}
setBounds(frame);
for(node = node.begin(&who); node != node.end(); node++) {