mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Book formatter: Do not insert last page if it's empty, code cleanup

Browse Source
This commit is contained in:
MiroslavR 2014-09-22 21:25:41 +02:00
parent 4b1df64fba
commit f87d7c3fce
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwgui/formatting.cpp
View File

@ -233,7 +233,8 @@ namespace MWGui
}
// insert last page
pag << Paginator::Page(pag.getStartTop(), pag.getStartTop() + pag.getPageHeight());
if (pag.getStartTop() != pag.getCurrentTop())
pag << Paginator::Page(pag.getStartTop(), pag.getStartTop() + pag.getPageHeight());
paper->setSize(paper->getWidth(), pag.getCurrentTop());
@ -301,7 +302,7 @@ namespace MWGui
mPaginator.setStartTop(newStartTop);
}
mPaginator.modifyCurrentTop(getHeight());
mPaginator.setCurrentTop(newTop);
}
int GraphicElement::pageSplit()

2
apps/openmw/mwgui/formatting.hpp
View File

@ -81,8 +81,6 @@ namespace MWGui
void setStartTop(int top) { mStartTop = top; }
void setCurrentTop(int top) { mCurrentTop = top; }
void modifyStartTop(int mod) { mStartTop += mod; }
void modifyCurrentTop(int mod) { mCurrentTop += mod; }
Paginator & operator<<(const Page & page)
{