From e4443f2eed88dfc13aea2e61526b3f2bbe5b7213 Mon Sep 17 00:00:00 2001 From: pieh Date: Tue, 31 Jul 2012 11:22:35 +0200 Subject: fix screen calibration window broken after 1b0360eb resize and mover control are used only there and we hide/show them in CGUIWindowSettingsScreenCalibration::DoProcess which will cause false-positive result in current control no longer focusable test --- xbmc/guilib/GUIMoverControl.h | 1 + xbmc/guilib/GUIResizeControl.h | 1 + 2 files changed, 2 insertions(+) diff --git a/xbmc/guilib/GUIMoverControl.h b/xbmc/guilib/GUIMoverControl.h index f1a748dbca..81c28b23a9 100644 --- a/xbmc/guilib/GUIMoverControl.h +++ b/xbmc/guilib/GUIMoverControl.h @@ -76,6 +76,7 @@ public: void SetLocation(int iLocX, int iLocY, bool bSetPosition = true); int GetXLocation() const { return m_iLocationX;}; int GetYLocation() const { return m_iLocationY;}; + virtual bool CanFocus() const { return true; }; protected: virtual EVENT_RESULT OnMouseEvent(const CPoint &point, const CMouseEvent &event); diff --git a/xbmc/guilib/GUIResizeControl.h b/xbmc/guilib/GUIResizeControl.h index abac66c5e1..9085e55532 100644 --- a/xbmc/guilib/GUIResizeControl.h +++ b/xbmc/guilib/GUIResizeControl.h @@ -65,6 +65,7 @@ public: virtual void SetInvalid(); virtual void SetPosition(float posX, float posY); void SetLimits(float x1, float y1, float x2, float y2); + virtual bool CanFocus() const { return true; }; protected: virtual EVENT_RESULT OnMouseEvent(const CPoint &point, const CMouseEvent &event); -- cgit v1.2.3