diff --git a/src/utils/xcbutils.h b/src/utils/xcbutils.h index 8de37e2b3f..b5981d5b96 100644 --- a/src/utils/xcbutils.h +++ b/src/utils/xcbutils.h @@ -604,22 +604,22 @@ public: { } - inline QRectF rect() + inline QRect rect() { const xcb_get_geometry_reply_t *geometry = data(); if (!geometry) { return QRect(); } - return QRectF(Xcb::fromXNative(geometry->x), Xcb::fromXNative(geometry->y), Xcb::fromXNative(geometry->width), Xcb::fromXNative(geometry->height)); + return QRect(geometry->x, geometry->y, geometry->width, geometry->height); } - inline QSizeF size() + inline QSize size() { const xcb_get_geometry_reply_t *geometry = data(); if (!geometry) { return QSize(); } - return QSizeF(Xcb::fromXNative(geometry->width), Xcb::fromXNative(geometry->height)); + return QSize(geometry->width, geometry->height); } }; diff --git a/src/x11window.cpp b/src/x11window.cpp index 72600f9c44..b82dfbc4f2 100644 --- a/src/x11window.cpp +++ b/src/x11window.cpp @@ -538,9 +538,9 @@ bool X11Window::track(xcb_window_t w) m_client.reset(w, false); Xcb::selectInput(w, attr->your_event_mask | XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_PROPERTY_CHANGE); - m_bufferGeometry = geo.rect(); - m_frameGeometry = geo.rect(); - m_clientGeometry = geo.rect(); + m_bufferGeometry = Xcb::fromXNative(geo.rect()); + m_frameGeometry = Xcb::fromXNative(geo.rect()); + m_clientGeometry = Xcb::fromXNative(geo.rect()); checkOutput(); m_visual = attr->visual; bit_depth = geo->depth; @@ -805,7 +805,7 @@ bool X11Window::manage(xcb_window_t w, bool isMapped) setOnActivities(activitiesList); } - QRectF geom = session ? session->geometry : windowGeometry.rect(); + QRectF geom = session ? session->geometry : Xcb::fromXNative(windowGeometry.rect()); bool placementDone = false; QRectF area;