ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Filtering

Browse source
This commit is contained in:
IlyaShurupov 2023-11-30 15:57:14 +03:00
parent d5ff875497
commit 5d7a343a20
1 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

51
LibraryViewer/public/LibraryGui.hpp
View file

@ -78,6 +78,7 @@ public:
void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& area) { void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& area) {
if (!mTrack) return; if (!mTrack) return;
if (!areaParent.isOverlap(area)) return; if (!areaParent.isOverlap(area)) return;
} }
void draw(Canvas& canvas, const tp::RectF& areaParent, const tp::RectF& area) { void draw(Canvas& canvas, const tp::RectF& areaParent, const tp::RectF& area) {
@ -133,8 +134,11 @@ public:
ImGui::Separator(); ImGui::Separator();
ImGui::Checkbox("Loved only", &filterLoved); if (ImGui::Checkbox("Loved only", &filterLoved)) {
songFilter.Draw("Song Filter"); isSongFilterChanged |= true;
}
isSongFilterChanged |= songFilter.Draw("Song Filter");
sortFilter.Draw("Sorting Type"); sortFilter.Draw("Sorting Type");
@ -168,6 +172,7 @@ public:
bool filterLoved = false; bool filterLoved = false;
TrackPlayer* mPlayer = nullptr; TrackPlayer* mPlayer = nullptr;
bool mLoadStatus = false; bool mLoadStatus = false;
bool isSongFilterChanged = true;
}; };
@ -177,7 +182,10 @@ public:
ScrollBarWidget() = default; ScrollBarWidget() = default;
void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& area) { void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& area) {
if (mSizeFraction > 1.f) return; if (mSizeFraction > 1.f) {
mPositionFraction = 0;
return;
}
if (!areaParent.isOverlap(area)) { if (!areaParent.isOverlap(area)) {
mIsScrolling = false; mIsScrolling = false;
@ -301,9 +309,11 @@ public:
} }
void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& aArea) { void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& aArea) {
mNeedRedraw = events.isEvent(); mNeedRedraw = events.isEvent() || mCurrentTrackInfo.songFilter.IsActive();
if (!mNeedRedraw) return; if (!mNeedRedraw) return;
filter();
mResizeWidget.max = aArea.z - trackInfoSize; mResizeWidget.max = aArea.z - trackInfoSize;
mResizeWidget.min = 100; mResizeWidget.min = 100;
@ -312,18 +322,18 @@ public:
areaInfo = { mResizeWidget.value + resizeSize, aArea.y, aArea.z - mResizeWidget.value - resizeSize, aArea.w - controllPanelSize } ; areaInfo = { mResizeWidget.value + resizeSize, aArea.y, aArea.z - mResizeWidget.value - resizeSize, aArea.w - controllPanelSize } ;
areaResize = { mResizeWidget.value, aArea.y, resizeSize, areaInfo.w }; areaResize = { mResizeWidget.value, aArea.y, resizeSize, areaInfo.w };
mScroll.mSizeFraction = area.w / (mLibrary->mTraks.size() * trackSize); mScroll.mSizeFraction = (area.w - 10) / (mTraksFiltered.size() * trackSize);
mScroll.mScrollFactor = 1.f / mLibrary->mTraks.size(); mScroll.mScrollFactor = 1.f / mTraksFiltered.size();
mScroll.proc(events, area, { area.x + area.z - scrollSize - 3, area.y + 10, scrollSize - 3.f, area.w - 20 } ); mScroll.proc(events, area, { area.x + area.z - scrollSize - 3, area.y + 10, scrollSize - 3.f, area.w - 20 } );
mResizeWidget.proc(events, area, areaResize ); mResizeWidget.proc(events, area, areaResize );
if (area.isInside(events.getPos())) { if (area.isInside(events.getPos())) {
tp::halnf offset = mScroll.mPositionFraction * mLibrary->mTraks.size() * trackSize; tp::halnf offset = mScroll.mPositionFraction * mTraksFiltered.size() * trackSize;
auto idx = 0; auto idx = 0;
for (auto track : mTraks) { for (auto track : mTraksFiltered) {
auto trackArea = tp::RectF{ area.x + 10, area.y + 10 + idx * trackSize - offset, area.z - 20 - scrollSize, trackSize - 5 }; auto trackArea = tp::RectF{ area.x + 10, area.y + 10 + idx * trackSize - offset, area.z - 20 - scrollSize, trackSize - 5 };
track->proc(events, area, trackArea); track->proc(events, area, trackArea);
@ -344,10 +354,10 @@ public:
canvas.rect(aArea, { 0.1f, 0.1f, 0.1f, 1.f }); canvas.rect(aArea, { 0.1f, 0.1f, 0.1f, 1.f });
tp::halnf offset = mScroll.mPositionFraction * mLibrary->mTraks.size() * trackSize; tp::halnf offset = mScroll.mPositionFraction * mTraksFiltered.size() * trackSize;
auto idx = 0; auto idx = 0;
for (auto track : mTraks) { for (auto track : mTraksFiltered) {
track->draw(canvas, area, { area.x + 10, area.y + 10 + idx * trackSize - offset, area.z - 20 - scrollSize, trackSize - 5 } ); track->draw(canvas, area, { area.x + 10, area.y + 10 + idx * trackSize - offset, area.z - 20 - scrollSize, trackSize - 5 } );
idx++; idx++;
} }
@ -367,6 +377,25 @@ public:
mCurrentTrack.draw(canvas, area, area); mCurrentTrack.draw(canvas, area, area);
} }
void filter() {
if (!mCurrentTrackInfo.isSongFilterChanged) return;
mTraksFiltered.clear();
for (auto track : mTraks) {
if (!mCurrentTrackInfo.songFilter.PassFilter(track->mTrack->mName.read()) && !mCurrentTrackInfo.songFilter.PassFilter(track->mTrack->mArtist.read())) {
continue;
}
if (mCurrentTrackInfo.filterLoved && !track->mTrack->mLoved) {
continue;
}
mTraksFiltered.append( &track.data() );
}
mCurrentTrackInfo.isSongFilterChanged = false;
}
private: private:
tp::halnf scrollSize = 20; tp::halnf scrollSize = 20;
tp::halnf trackInfoSize = 200; tp::halnf trackInfoSize = 200;
@ -381,6 +410,8 @@ private:
tp::RectF areaResize; tp::RectF areaResize;
tp::Buffer<TrackWidget<Events, Canvas>> mTraks; tp::Buffer<TrackWidget<Events, Canvas>> mTraks;
tp::Buffer<TrackWidget<Events, Canvas>*> mTraksFiltered;
TrackWidget<Events, Canvas> mCurrentTrack; TrackWidget<Events, Canvas> mCurrentTrack;
TrackInfoWidget<Events, Canvas> mCurrentTrackInfo; TrackInfoWidget<Events, Canvas> mCurrentTrackInfo;