Merge remote-tracking branch 'refs/remotes/WagicProject/master'

This commit is contained in:
Anthony Calosa
2016-07-11 20:01:38 +08:00

View File

@@ -2,8 +2,8 @@
const float GridDeckView::scroll_animation_duration = 0.3f; const float GridDeckView::scroll_animation_duration = 0.3f;
const float GridDeckView::slide_animation_duration = 0.6f; const float GridDeckView::slide_animation_duration = 0.6f;
const float GridDeckView::card_scale_small = 0.48f; const float GridDeckView::card_scale_small = 0.47f;
const float GridDeckView::card_scale_big = 0.7f; const float GridDeckView::card_scale_big = 0.6f;
GridDeckView::GridDeckView() GridDeckView::GridDeckView()
: DeckView(16), mCols(8), mRows(2), mScrollOffset(0), mSlideOffset(0), : DeckView(16), mCols(8), mRows(2), mScrollOffset(0), mSlideOffset(0),