vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Port InputPanelV1Client to WaylandClient's geometry helpers

master
Vlad Zahorodnii 2020-08-21 10:07:59 +03:00
parent fde34f3c57
commit e2aaff63f7
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
inputpanelv1client.cpp
View File

@ -74,7 +74,7 @@ void KWin::InputPanelV1Client::reposition()
const auto outputGeometry = m_output->geometry(); const auto outputGeometry = m_output->geometry();
QRect geo(outputGeometry.topLeft(), panelSize); QRect geo(outputGeometry.topLeft(), panelSize);
geo.translate((outputGeometry.width() - panelSize.width())/2, outputGeometry.height() - panelSize.height()); geo.translate((outputGeometry.width() - panelSize.width())/2, outputGeometry.height() - panelSize.height());
setFrameGeometry(geo); updateGeometry(geo);
} }
} break; } break;
case Overlay: { case Overlay: {
@ -82,29 +82,12 @@ void KWin::InputPanelV1Client::reposition()
auto textInput = waylandServer()->seat()->focusedTextInput(); auto textInput = waylandServer()->seat()->focusedTextInput();
if (textClient && textInput) { if (textClient && textInput) {
const auto cursorRectangle = textInput->cursorRectangle(); const auto cursorRectangle = textInput->cursorRectangle();
setFrameGeometry({textClient->pos() + textClient->clientPos() + cursorRectangle.bottomLeft(), surface()->size()}); updateGeometry({textClient->pos() + textClient->clientPos() + cursorRectangle.bottomLeft(), surface()->size()});
} }
} break; } break;
} }
} }
void InputPanelV1Client::setFrameGeometry(const QRect &geometry, ForceGeometry_t force)
{
Q_UNUSED(force);
if (m_frameGeometry != geometry) {
const QRect oldFrameGeometry = m_frameGeometry;
m_frameGeometry = geometry;
m_clientGeometry = geometry;
emit frameGeometryChanged(this, oldFrameGeometry);
emit clientGeometryChanged(this, oldFrameGeometry);
emit bufferGeometryChanged(this, oldFrameGeometry);
emit geometryShapeChanged(this, oldFrameGeometry);
addRepaintDuringGeometryUpdates();
}
}
void InputPanelV1Client::destroyClient() void InputPanelV1Client::destroyClient()
{ {
markAsZombie(); markAsZombie();

3
inputpanelv1client.h
View File

@ -29,10 +29,7 @@ public:
}; };
Q_ENUM(Mode) Q_ENUM(Mode)
void setFrameGeometry(const QRect &geometry, KWin::AbstractClient::ForceGeometry_t force = NormalGeometrySet) override;
void destroyClient() override; void destroyClient() override;
QRect bufferGeometry() const override { return frameGeometry(); }
bool isPlaceable() const override { return false; } bool isPlaceable() const override { return false; }
bool isCloseable() const override { return false; } bool isCloseable() const override { return false; }
bool isResizable() const override { return false; } bool isResizable() const override { return false; }