summaryrefslogtreecommitdiff
path: root/src/localbrowser
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-21 13:06:54 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-21 13:06:54 (GMT)
commit62f067d29ded06fe0ac14c026ae6236549ba21cc (patch)
treeb62abedd3d7d659eb133e077a508725d4444e434 /src/localbrowser
parent41e622ab784b64f5a2514678024ed56a28e36080 (diff)
downloadpowder-62f067d29ded06fe0ac14c026ae6236549ba21cc.zip
powder-62f067d29ded06fe0ac14c026ae6236549ba21cc.tar.gz
Fix stamps page count
Diffstat (limited to 'src/localbrowser')
-rw-r--r--src/localbrowser/LocalBrowserModel.cpp5
-rw-r--r--src/localbrowser/LocalBrowserModel.h2
-rw-r--r--src/localbrowser/LocalBrowserView.cpp8
3 files changed, 11 insertions, 4 deletions
diff --git a/src/localbrowser/LocalBrowserModel.cpp b/src/localbrowser/LocalBrowserModel.cpp
index 60e20c3..a38ca1f 100644
--- a/src/localbrowser/LocalBrowserModel.cpp
+++ b/src/localbrowser/LocalBrowserModel.cpp
@@ -87,6 +87,11 @@ void LocalBrowserModel::UpdateSavesList(int pageNumber)
notifySavesListChanged();
}
+int LocalBrowserModel::GetPageCount()
+{
+ return std::max(1, (int)(std::ceil(float(Client::Ref().GetStampsCount())/20.0f)));
+}
+
void LocalBrowserModel::SelectSave(std::string stampID)
{
for(int i = 0; i < selected.size(); i++)
diff --git a/src/localbrowser/LocalBrowserModel.h b/src/localbrowser/LocalBrowserModel.h
index a0a2956..e6b6905 100644
--- a/src/localbrowser/LocalBrowserModel.h
+++ b/src/localbrowser/LocalBrowserModel.h
@@ -27,7 +27,7 @@ class LocalBrowserModel {
void notifySelectedChanged();
public:
LocalBrowserModel();
- int GetPageCount() { return std::max(1, (int)(std::ceil(stampIDs.size()/16))); }
+ int GetPageCount();
int GetPageNum() { return currentPage; }
void AddObserver(LocalBrowserView * observer);
std::vector<SaveFile *> GetSavesList();
diff --git a/src/localbrowser/LocalBrowserView.cpp b/src/localbrowser/LocalBrowserView.cpp
index 448b5c5..234b14b 100644
--- a/src/localbrowser/LocalBrowserView.cpp
+++ b/src/localbrowser/LocalBrowserView.cpp
@@ -41,7 +41,8 @@ LocalBrowserView::LocalBrowserView():
}
};
nextButton->SetActionCallback(new NextPageAction(this));
- nextButton->Appearance.HorizontalAlign = ui::Appearance::AlignRight; nextButton->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
+ nextButton->Appearance.HorizontalAlign = ui::Appearance::AlignRight;
+ nextButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
class PrevPageAction : public ui::ButtonAction
{
@@ -54,7 +55,8 @@ LocalBrowserView::LocalBrowserView():
}
};
previousButton->SetActionCallback(new PrevPageAction(this));
- previousButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; previousButton->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
+ previousButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+ previousButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
class RemoveSelectedAction : public ui::ButtonAction
{
@@ -186,7 +188,7 @@ void LocalBrowserView::OnMouseWheel(int x, int y, int d)
{
if(!d)
return;
- if(d<0)
+ if(d>0)
c->NextPage();
else
c->PrevPage();