ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qt5: let QNitpickerViewWidget react to focus event 

With this patch, when calling 'setFocus()' on a QNitpickerViewWidget, the
Nitpicker view gets the input focus (provided that the parent Qt window
already had it).

Fixes #1314
This commit is contained in:
Christian Prochaska 2014-12-04 16:20:56 +01:00 committed by Christian Helmuth
parent a9a6e8df89
commit 21154d6866
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
repos/libports/include/qt5/qnitpickerviewwidget/qnitpickerviewwidget.h
View File

@ -75,6 +75,7 @@ protected:
virtual void showEvent(QShowEvent *event); virtual void showEvent(QShowEvent *event);
virtual void hideEvent(QHideEvent *event); virtual void hideEvent(QHideEvent *event);
virtual void paintEvent(QPaintEvent *event); virtual void paintEvent(QPaintEvent *event);
virtual void focusInEvent(QFocusEvent * event);
public: public:

8
repos/libports/src/lib/qt5/qnitpickerviewwidget/qnitpickerviewwidget.cpp
View File

@ -226,3 +226,11 @@ void QNitpickerViewWidget::paintEvent(QPaintEvent *event)
nitpicker->release_view_handle(neighbor_handle); nitpicker->release_view_handle(neighbor_handle);
} }
void QNitpickerViewWidget::focusInEvent(QFocusEvent *)
{
QNitpickerPlatformWindow *platform_window =
dynamic_cast<QNitpickerPlatformWindow*>(window()->windowHandle()->handle());
platform_window->nitpicker().focus(*nitpicker);
}

5
repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp
View File

@ -573,6 +573,11 @@ void QNitpickerPlatformWindow::egl_surface(EGLSurface egl_surface)
_egl_surface = egl_surface; _egl_surface = egl_surface;
} }
Nitpicker::Session_client &QNitpickerPlatformWindow::nitpicker()
{
return _nitpicker_session;
}
Nitpicker::View_capability QNitpickerPlatformWindow::view_cap() const Nitpicker::View_capability QNitpickerPlatformWindow::view_cap() const
{ {
QNitpickerPlatformWindow *npw = const_cast<QNitpickerPlatformWindow *>(this); QNitpickerPlatformWindow *npw = const_cast<QNitpickerPlatformWindow *>(this);

1
repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.h
View File

@ -155,6 +155,7 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow
/* for QNitpickerViewWidget */ /* for QNitpickerViewWidget */
Nitpicker::Session_client &nitpicker();
Nitpicker::View_capability view_cap() const; Nitpicker::View_capability view_cap() const;
signals: signals: