Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not look at emptiness when changing windows

Browse Source
This commit is contained in:
Andrzej Rybczak
2016-11-13 06:30:12 +01:00
parent 9b6a080a29
commit dbf5a1dbd8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/media_library.cpp
View File

@@ -487,7 +487,7 @@ void MediaLibrary::mouseButtonPressed(MEVENT me)
} }
return result; return result;
}; };
if (!Tags.empty() && Tags.hasCoords(me.x, me.y)) if (Tags.hasCoords(me.x, me.y))
{ {
if (!tryPreviousColumn() || !tryPreviousColumn()) if (!tryPreviousColumn() || !tryPreviousColumn())
return; return;
@@ -502,7 +502,7 @@ void MediaLibrary::mouseButtonPressed(MEVENT me)
Albums.clear(); Albums.clear();
Songs.clear(); Songs.clear();
} }
else if (!Albums.empty() && Albums.hasCoords(me.x, me.y)) else if (Albums.hasCoords(me.x, me.y))
{ {
if (!isActiveWindow(Albums)) if (!isActiveWindow(Albums))
{ {
@@ -524,7 +524,7 @@ void MediaLibrary::mouseButtonPressed(MEVENT me)
Screen<WindowType>::mouseButtonPressed(me); Screen<WindowType>::mouseButtonPressed(me);
Songs.clear(); Songs.clear();
} }
else if (!Songs.empty() && Songs.hasCoords(me.x, me.y)) else if (Songs.hasCoords(me.x, me.y))
{ {
if (!tryNextColumn() || !tryNextColumn()) if (!tryNextColumn() || !tryNextColumn())
return; return;

4
src/playlist_editor.cpp
View File

@@ -227,7 +227,7 @@ int PlaylistEditor::windowTimeout()
void PlaylistEditor::mouseButtonPressed(MEVENT me) void PlaylistEditor::mouseButtonPressed(MEVENT me)
{ {
if (!Playlists.empty() && Playlists.hasCoords(me.x, me.y)) if (Playlists.hasCoords(me.x, me.y))
{ {
if (!isActiveWindow(Playlists)) if (!isActiveWindow(Playlists))
{ {
@@ -246,7 +246,7 @@ void PlaylistEditor::mouseButtonPressed(MEVENT me)
Screen<WindowType>::mouseButtonPressed(me); Screen<WindowType>::mouseButtonPressed(me);
Content.clear(); Content.clear();
} }
else if (!Content.empty() && Content.hasCoords(me.x, me.y)) else if (Content.hasCoords(me.x, me.y))
{ {
if (!isActiveWindow(Content)) if (!isActiveWindow(Content))
{ {