LockScreenShield: move the shared definition for FindKeyFocusArea to BaseShield

(bzr r3788.11.6)

5 files changed, 15 insertions, 28 deletions

diff --git a/lockscreen/KylinLockScreenShield.cpp b/lockscreen/KylinLockScreenShield.cpp
index 067fe6b5a..8074f46cc 100644
--- a/lockscreen/KylinLockScreenShield.cpp
+++ b/lockscreen/KylinLockScreenShield.cpp
@@ -77,21 +77,5 @@ void KylinShield::ShowPrimaryView()
 main_layout->AddSpace(0, 10);
 }
 
-nux::Area* KylinShield::FindKeyFocusArea(unsigned etype, unsigned long keysym, unsigned long modifiers)
-{
- if (primary)
- {
- if (prompt_view_)
- {
- auto* focus_view = prompt_view_->focus_view();
-
- if (focus_view && focus_view->GetInputEventSensitivity())
- return focus_view;
- }
- }
-
- return nullptr;
-}
-
 }
 }
diff --git a/lockscreen/KylinLockScreenShield.h b/lockscreen/KylinLockScreenShield.h
index 93294521a..fb33706b0 100644
--- a/lockscreen/KylinLockScreenShield.h
+++ b/lockscreen/KylinLockScreenShield.h
@@ -41,9 +41,6 @@ public:
 nux::ObjectPtr<AbstractUserPromptView> const&,
 int monitor, bool is_primary);
 
-protected:
- nux::Area* FindKeyFocusArea(unsigned int, unsigned long, unsigned long) override;
-
 private:
 void ShowPrimaryView() override;
 };
diff --git a/lockscreen/LockScreenBaseShield.cpp b/lockscreen/LockScreenBaseShield.cpp
index 06ca19b7f..cfd56814c 100644
--- a/lockscreen/LockScreenBaseShield.cpp
+++ b/lockscreen/LockScreenBaseShield.cpp
@@ -89,6 +89,19 @@ bool BaseShield::HasGrab() const
 return (wc.GetPointerGrabArea() == this && wc.GetKeyboardGrabArea() == this);
 }
 
+nux::Area* BaseShield::FindKeyFocusArea(unsigned etype, unsigned long keysym, unsigned long modifiers)
+{
+ if (primary && prompt_view_)
+ {
+ auto* focus_view = prompt_view_->focus_view();
+
+ if (focus_view && focus_view->GetInputEventSensitivity())
+ return focus_view;
+ }
+
+ return nullptr;
+}
+
 nux::Area* BaseShield::FindAreaUnderMouse(nux::Point const& mouse, nux::NuxEventType event_type)
 {
 nux::Area* area = BaseWindow::FindAreaUnderMouse(mouse, event_type);
diff --git a/lockscreen/LockScreenBaseShield.h b/lockscreen/LockScreenBaseShield.h
index 9b12d5275..9cd1e164e 100644
--- a/lockscreen/LockScreenBaseShield.h
+++ b/lockscreen/LockScreenBaseShield.h
@@ -60,6 +60,7 @@ protected:
 virtual void ShowPrimaryView() = 0;
 virtual void ShowSecondaryView();
 
+ nux::Area* FindKeyFocusArea(unsigned int, unsigned long, unsigned long) override;
 nux::Area* FindAreaUnderMouse(nux::Point const& mouse, nux::NuxEventType event_type) override;
 
 void GrabScreen(bool cancel_on_failure);
diff --git a/lockscreen/LockScreenShield.cpp b/lockscreen/LockScreenShield.cpp
index 0d5941bbd..77d8fc574 100644
--- a/lockscreen/LockScreenShield.cpp
+++ b/lockscreen/LockScreenShield.cpp
@@ -132,17 +132,9 @@ nux::Area* Shield::FindKeyFocusArea(unsigned etype, unsigned long keysym, unsign
 return panel_view_;
 }
 }
-
- if (prompt_view_)
- {
- auto* focus_view = prompt_view_->focus_view();
-
- if (focus_view && focus_view->GetInputEventSensitivity())
- return focus_view;
- }
 }
 
- return nullptr;
+ return BaseShield::FindKeyFocusArea(etype, keysym, modifiers);
 }
 
 bool Shield::IsIndicatorOpen() const