Fixed keypress eating by child views in dash previews.

(bzr r2588.1.1)

6 files changed, 15 insertions, 2 deletions

diff --git a/dash/previews/Preview.h b/dash/previews/Preview.h
index d4ae1e74a..134ada297 100644
--- a/dash/previews/Preview.h
+++ b/dash/previews/Preview.h
@@ -69,6 +69,8 @@ protected:
 virtual void OnNavigateInComplete() {}
 virtual void OnNavigateOut() {}
 
+ virtual bool AcceptKeyNavFocus() { return false; }
+
 nux::Layout* BuildGridActionsLayout(dash::Preview::ActionPtrList actions, std::list<nux::AbstractButton*>& buttons);
 nux::Layout* BuildVerticalActionsLayout(dash::Preview::ActionPtrList actions, std::list<nux::AbstractButton*>& buttons);
 
diff --git a/dash/previews/PreviewInfoHintWidget.h b/dash/previews/PreviewInfoHintWidget.h
index 72591c22f..5c5713a08 100644
--- a/dash/previews/PreviewInfoHintWidget.h
+++ b/dash/previews/PreviewInfoHintWidget.h
@@ -58,6 +58,8 @@ public:
 protected:
 virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
 virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
+ 
+ virtual bool AcceptKeyNavFocus() { return false; }
 
 void SetupBackground();
 void SetupViews();
diff --git a/dash/previews/PreviewRatingsWidget.h b/dash/previews/PreviewRatingsWidget.h
index ca2031c34..bdba0de04 100644
--- a/dash/previews/PreviewRatingsWidget.h
+++ b/dash/previews/PreviewRatingsWidget.h
@@ -54,6 +54,8 @@ public:
 protected:
 virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
 virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
+ 
+ virtual bool AcceptKeyNavFocus() { return false; }
 
 private:
 RatingsButton* ratings_;
diff --git a/dash/previews/Track.cpp b/dash/previews/Track.cpp
index 7160c6d1a..924b0c211 100644
--- a/dash/previews/Track.cpp
+++ b/dash/previews/Track.cpp
@@ -42,12 +42,15 @@ class TmpView : public nux::View
 public:
 TmpView(NUX_FILE_LINE_PROTO): View(NUX_FILE_LINE_PARAM) {}
 
- void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw) {}
- void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw)
+ virtual void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw) {}
+ virtual void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw)
 {
 if (GetCompositionLayout())
 GetCompositionLayout()->ProcessDraw(gfx_engine, force_draw);
 }
+ 
+ virtual bool AcceptKeyNavFocus() { return false; }
+
 };
 
 namespace
diff --git a/dash/previews/Track.h b/dash/previews/Track.h
index 554de51bc..8b387e5e2 100644
--- a/dash/previews/Track.h
+++ b/dash/previews/Track.h
@@ -66,6 +66,8 @@ protected:
 virtual void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);
 virtual void PreLayoutManagement();
 
+ virtual bool AcceptKeyNavFocus() { return false; }
+ 
 void SetupBackground();
 void SetupViews();
 
diff --git a/dash/previews/Tracks.h b/dash/previews/Tracks.h
index 794a6df4b..6f629d7dc 100644
--- a/dash/previews/Tracks.h
+++ b/dash/previews/Tracks.h
@@ -58,6 +58,8 @@ public:
 protected:
 virtual void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw);
 virtual void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);
+ 
+ virtual bool AcceptKeyNavFocus() { return false; }
 
 void SetupViews();