diff options
| author | Nick Dedekind <nicholas.dedekind@gmail.com> | 2012-08-07 10:59:31 +0100 |
|---|---|---|
| committer | Nick Dedekind <nicholas.dedekind@gmail.com> | 2012-08-07 10:59:31 +0100 |
| commit | 00f2f572bb7999116af359dccd34510797c5c2cc (patch) | |
| tree | cdc1bf7fe4b9aea8245e94eaa9b5aab64c90a811 /dash | |
| parent | cf66373872ec9b5a90547cbad5baf1326021ea11 (diff) | |
Fixed preview standalone navigation logic
(bzr r2419.4.38)
Diffstat (limited to 'dash')
| -rw-r--r-- | dash/previews/StandaloneMusicPreview.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/dash/previews/StandaloneMusicPreview.cpp b/dash/previews/StandaloneMusicPreview.cpp index d5f3c27ac..7c9125285 100644 --- a/dash/previews/StandaloneMusicPreview.cpp +++ b/dash/previews/StandaloneMusicPreview.cpp @@ -155,6 +155,8 @@ TestRunner::TestRunner (std::string const& search_string) results_->result_added.connect([&](Result const& result) { + printf("Number of results: %d\n", results_->count.Get()); + previews::Navigation navDisabled = previews::Navigation::BOTH; if (nav_iter < results_->count.Get()) navDisabled = previews::Navigation( (unsigned int)results_ & ~((unsigned int)previews::Navigation::RIGHT)); @@ -203,10 +205,10 @@ void TestRunner::NavRight() Preview(result.uri); previews::Navigation navDisabled = previews::Navigation::BOTH; - if (nav_iter < results_->count.Get()) - navDisabled = previews::Navigation( (unsigned int)results_ & ~((unsigned int)previews::Navigation::RIGHT)); + if (nav_iter < results_->count.Get()-1) + navDisabled = previews::Navigation( (unsigned int)navDisabled & ~((unsigned int)previews::Navigation::RIGHT)); if (results_->count.Get() > 0 && nav_iter > 0) - navDisabled = previews::Navigation( (unsigned int)results_ & ~((unsigned int)previews::Navigation::LEFT)); + navDisabled = previews::Navigation( (unsigned int)navDisabled & ~((unsigned int)previews::Navigation::LEFT)); container_->DisableNavButton(navDisabled); } @@ -219,10 +221,10 @@ void TestRunner::NavLeft() Preview(result.uri); previews::Navigation navDisabled = previews::Navigation::BOTH; - if (nav_iter < results_->count.Get()) - navDisabled = previews::Navigation( (unsigned int)results_ & ~((unsigned int)previews::Navigation::RIGHT)); + if (nav_iter < results_->count.Get()-1) + navDisabled = previews::Navigation( (unsigned int)navDisabled & ~((unsigned int)previews::Navigation::RIGHT)); if (results_->count.Get() > 0 && nav_iter > 0) - navDisabled = previews::Navigation( (unsigned int)results_ & ~((unsigned int)previews::Navigation::LEFT)); + navDisabled = previews::Navigation( (unsigned int)navDisabled & ~((unsigned int)previews::Navigation::LEFT)); container_->DisableNavButton(navDisabled); } |