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

Graphics refactor finished

Browse source
This commit is contained in:
IlyaShurupov 2024-03-20 11:31:50 +03:00 • committed by Ilya Shurupov
parent bfbdd0e33b
commit 8451c56e93
12 changed files with 114 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

22
LibraryViewer/public/GUI.hpp
View file

@ -26,9 +26,9 @@ namespace tp {
if (!mTrack) return;
if (!areaParent.isOverlap(area)) return;
if (area.isInside(events.getPos())) {
if (area.isInside(events.getPointer())) {
col.set({ 0.15f, 0.15f, 0.15f, 1.f });
mSelected = events.isReleased();
mSelected = events.isReleased(InputID::MOUSE1);
} else {
col.set({ 0.15f, 0.15f, 0.15f, 0.f });
}
@ -94,6 +94,7 @@ namespace tp {
if (!this->mVisible) return;
if (!mTrack) return;
// canvas.rect(this->mArea, { 0.13f, 0.13f, 0.13f, 1.f }, 4.f);
renderUI();
}
void renderUI() {
@ -207,11 +208,16 @@ namespace tp {
mLibrary = (lib);
mPlayer = (player);
updateTracks();
mCurrentTrackInfo.mPlayer = mPlayer;
}
void updateTracks() {
mTracks.clear();
for (auto track : mLibrary->mTraks) {
mTracks.append(TrackWidget<Events, Canvas>(&track.data()));
}
mCurrentTrackInfo.mPlayer = mPlayer;
}
void proc(const Events& events, const RectF& areaParent, const RectF& aArea) override {
@ -219,11 +225,6 @@ namespace tp {
this->mVisible = this->mArea.isOverlap(areaParent);
if (!this->mVisible) return;
mCurrentTrackInfo.renderUI();
mNeedRedraw = events.isEvent() || mCurrentTrackInfo.songFilter.IsActive();
if (!mNeedRedraw) return;
filter();
mSplitView.proc(events, this->mArea, this->mArea);
@ -249,7 +250,6 @@ namespace tp {
mSplitView.draw(canvas);
mSongList.draw(canvas);
mCurrentTrackInfo.draw(canvas);
// mCurrentTrack.proc(canvas);
}
void filter() {
@ -292,7 +292,5 @@ namespace tp {
ScrollableWindow<Events, Canvas> mSongList;
TrackInfoWidget<Events, Canvas> mCurrentTrackInfo;
TrackWidget<Events, Canvas> mCurrentTrack;
bool mNeedRedraw = false;
};
}