new feature: support for merging screens together

2011-11-12 19:47:47 +01:00
parent e31dec7005
commit 56467eaac6
44 changed files with 633 additions and 218 deletions
--- a/src/search_engine.h
+++ b/src/search_engine.h
@@ -48,6 +48,8 @@ class SearchEngine : public Screen< Menu< std::pair<Buffer *, MPD::Song *> > >
 		
 		virtual List *GetList() { return w->Size() >= StaticOptions ? w : 0; }
 		
+		virtual bool isMergable() { return true; }
+		
 		void UpdateFoundList();
 		void Scroll(int);
 		void SelectAlbum();
@@ -58,6 +60,7 @@ class SearchEngine : public Screen< Menu< std::pair<Buffer *, MPD::Song *> > >
 		
 	protected:
 		virtual void Init();
+		virtual bool isLockable() { return true; }
 		
 	private:
 		void Prepare();