diff options
Diffstat (limited to 'src/compositor/extensions/qwltextinput.cpp')
| -rw-r--r-- | src/compositor/extensions/qwltextinput.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/compositor/extensions/qwltextinput.cpp b/src/compositor/extensions/qwltextinput.cpp index 465972d8..d9e1774b 100644 --- a/src/compositor/extensions/qwltextinput.cpp +++ b/src/compositor/extensions/qwltextinput.cpp @@ -36,11 +36,12 @@ #include "qwltextinput_p.h" -#include "qwlcompositor_p.h" #include "qwlinputdevice_p.h" #include "qwlinputmethod_p.h" #include "qwlinputmethodcontext_p.h" #include "qwlinputpanel_p.h" +#include <QtCompositor/QWaylandInputPanel> +#include <QtCompositor/QWaylandCompositor> #include <algorithm> @@ -48,7 +49,7 @@ QT_BEGIN_NAMESPACE namespace QtWayland { -TextInput::TextInput(QWaylandExtensionContainer *container, Compositor *compositor, struct ::wl_client *client, int id) +TextInput::TextInput(QWaylandExtensionContainer *container, QWaylandCompositor *compositor, struct ::wl_client *client, int id) : QWaylandExtensionTemplate(container) , wl_text_input(client, id, 1) , m_compositor(compositor) @@ -129,7 +130,7 @@ void TextInput::text_input_show_input_panel(Resource *) m_inputPanelVisible = true; if (std::find_if(m_activeInputMethods.cbegin(), m_activeInputMethods.cend(), isInputMethodBound) != m_activeInputMethods.cend()){ - QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor->waylandCompositor()); + QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor); if (panel) panel->setInputPanelVisible(true); } @@ -140,7 +141,7 @@ void TextInput::text_input_hide_input_panel(Resource *) m_inputPanelVisible = false; if (std::find_if(m_activeInputMethods.cbegin(), m_activeInputMethods.cend(), isInputMethodBound) != m_activeInputMethods.cend()) { - QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor->waylandCompositor()); + QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor); if (panel) panel->setInputPanelVisible(false); } @@ -151,7 +152,7 @@ void TextInput::text_input_set_cursor_rectangle(Resource *, int32_t x, int32_t y m_cursorRectangle = QRect(x, y, width, height); if (!m_activeInputMethods.isEmpty()) { - QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor->waylandCompositor()); + QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor); if (panel) panel->setCursorRectangle(m_cursorRectangle); } |