mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-14 04:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed search results -> browse category title bug.

Browse Source
This commit is contained in:
casey langen 2016-12-06 01:00:08 -08:00
parent 1017d46016
commit 68f574235b
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/musikbox/app/layout/BrowseLayout.cpp
View File

@ -44,22 +44,36 @@
#include "BrowseLayout.h"
using namespace musik::core::library::constants;
#define DEFAULT_CATEGORY constants::Track::ARTIST
#define DEFAULT_CATEGORY_NAME "artists"
#define SET_CATEGORY(key, name) \
this->categoryList->SetFieldName(key); \
this->categoryTitle->SetText(name, text::AlignCenter);
static size_t MAX_CATEGORY_WIDTH = 40;
using namespace musik::core;
using namespace musik::core::audio;
using namespace musik::core::library;
using namespace musik::box;
using namespace cursespp;
static size_t MAX_CATEGORY_WIDTH = 40;
#define DEFAULT_CATEGORY constants::Track::ARTIST
#define DEFAULT_CATEGORY_NAME FIELD_TO_TITLE[DEFAULT_CATEGORY]
static std::map <std::string, std::string> FIELD_TO_TITLE{
std::make_pair(constants::Track::ARTIST, "artists"),
std::make_pair(constants::Track::ALBUM, "albums"),
std::make_pair(constants::Track::GENRE, "genres"),
std::make_pair(constants::Track::ALBUM_ARTIST, "album artists")
};
#define CATEGORY_TITLE(key) \
FIELD_TO_TITLE.find(key) == FIELD_TO_TITLE.end() ? "category" : FIELD_TO_TITLE[key]
#define SET_CATEGORY(key) { \
std::string title = CATEGORY_TITLE(key); \
this->categoryList->SetFieldName(key); \
this->categoryTitle->SetText(title, text::AlignCenter); \
}
#define SET_CATEGORY_TITLE(key) \
this->categoryTitle->SetText(CATEGORY_TITLE(key), text::AlignCenter);
BrowseLayout::BrowseLayout(
PlaybackService& playback,
LibraryPtr library)
@ -140,6 +154,7 @@ void BrowseLayout::InitializeWindows() {
void BrowseLayout::ScrollTo(const std::string& fieldType, DBID fieldId) {
this->SetFocus(this->trackList);
this->categoryList->RequeryWithField(fieldType, "", fieldId);
SET_CATEGORY_TITLE(fieldType);
}
IWindowPtr BrowseLayout::GetFocus() {
@ -195,19 +210,19 @@ bool BrowseLayout::KeyPress(const std::string& key) {
return true;
}
else if (Hotkeys::Is(Hotkeys::NavigateLibraryBrowseArtists, key)) {
SET_CATEGORY(constants::Track::ARTIST, "artists");
SET_CATEGORY(constants::Track::ARTIST);
return true;
}
else if (Hotkeys::Is(Hotkeys::NavigateLibraryBrowseAlbums, key)) {
SET_CATEGORY(constants::Track::ALBUM, "albums");
SET_CATEGORY(constants::Track::ALBUM);
return true;
}
else if (Hotkeys::Is(Hotkeys::NavigateLibraryBrowseGenres, key)) {
SET_CATEGORY(constants::Track::GENRE, "genres");
SET_CATEGORY(constants::Track::GENRE);
return true;
}
else if (Hotkeys::Is(Hotkeys::NavigateLibraryBrowseAlbumArtists, key)) {
SET_CATEGORY(constants::Track::ALBUM_ARTIST, "album artists");
SET_CATEGORY(constants::Track::ALBUM_ARTIST);
return true;
}

4
src/musikbox/app/layout/SearchLayout.cpp
View File

@ -93,7 +93,7 @@ void SearchLayout::Layout() {
this->artistsLabel->MoveAndResize(categoryWidth, labelY, categoryWidth, 1);
this->artists->MoveAndResize(categoryWidth, categoryY, categoryWidth, categoryHeight);
this->genresLabel->MoveAndResize(categoryWidth * 2, labelY, lastCategoryWidth, 1);
this->genres->MoveAndResize(categoryWidth * 2, categoryY, lastCategoryWidth, categoryHeight);
}
@ -167,7 +167,7 @@ bool SearchLayout::KeyPress(const std::string& key) {
int index = (int) category->GetSelectedIndex();
if (index >= 0) {
this->SearchResultSelected(
this,
this,
category->GetFieldName(),
category->GetSelectedId());
}