Changeset View
Changeset View
Standalone View
Standalone View
abstract_wayland_output.cpp
| Show First 20 Lines • Show All 48 Lines • ▼ Show 20 Line(s) | 48 | { | |||
|---|---|---|---|---|---|
| 49 | if (!m_waylandOutput) { | 49 | if (!m_waylandOutput) { | ||
| 50 | return i18n("unknown"); | 50 | return i18n("unknown"); | ||
| 51 | } | 51 | } | ||
| 52 | return QStringLiteral("%1 %2").arg(m_waylandOutput->manufacturer()).arg(m_waylandOutput->model()); | 52 | return QStringLiteral("%1 %2").arg(m_waylandOutput->manufacturer()).arg(m_waylandOutput->model()); | ||
| 53 | } | 53 | } | ||
| 54 | 54 | | |||
| 55 | QRect AbstractWaylandOutput::geometry() const | 55 | QRect AbstractWaylandOutput::geometry() const | ||
| 56 | { | 56 | { | ||
| 57 | // TODO: This is inefficient on current KWayland since | 57 | return QRect(globalPos(), pixelSize() / scale()); | ||
davidedmundson: This comment remains true, only even more so | |||||
Comment is removed because D23493 is a parent revision of this one. romangg: Comment is removed because D23493 is a parent revision of this one. | |||||
| 58 | // we loop over modes. | | |||
| 59 | // const QSize size = m_waylandOutputDevice->pixelSize(); | | |||
| 60 | const QSize size = pixelSize(); | | |||
| 61 | | ||||
| 62 | return QRect(globalPos(), size / scale()); | | |||
| 63 | } | 58 | } | ||
| 64 | 59 | | |||
| 65 | QSize AbstractWaylandOutput::physicalSize() const | 60 | QSize AbstractWaylandOutput::physicalSize() const | ||
| 66 | { | 61 | { | ||
| 67 | return orientateSize(m_physicalSize); | 62 | return orientateSize(m_physicalSize); | ||
| 68 | } | 63 | } | ||
| 69 | 64 | | |||
| 70 | int AbstractWaylandOutput::refreshRate() const | 65 | int AbstractWaylandOutput::refreshRate() const | ||
| Show All 17 Lines | 82 | if (m_waylandOutput) { | |||
| 88 | m_waylandOutput->setGlobalPosition(pos); | 83 | m_waylandOutput->setGlobalPosition(pos); | ||
| 89 | } | 84 | } | ||
| 90 | if (m_xdgOutput) { | 85 | if (m_xdgOutput) { | ||
| 91 | m_xdgOutput->setLogicalPosition(pos); | 86 | m_xdgOutput->setLogicalPosition(pos); | ||
| 92 | m_xdgOutput->done(); | 87 | m_xdgOutput->done(); | ||
| 93 | } | 88 | } | ||
| 94 | } | 89 | } | ||
| 95 | 90 | | |||
| 91 | QSize AbstractWaylandOutput::pixelSize() const | ||||
| 92 | { | ||||
| 93 | return orientateSize(m_waylandOutputDevice->pixelSize()); | ||||
| 94 | } | ||||
| 95 | | ||||
| 96 | qreal AbstractWaylandOutput::scale() const | 96 | qreal AbstractWaylandOutput::scale() const | ||
| 97 | { | 97 | { | ||
| 98 | return m_waylandOutputDevice->scaleF(); | 98 | return m_waylandOutputDevice->scaleF(); | ||
| 99 | } | 99 | } | ||
| 100 | 100 | | |||
| 101 | void AbstractWaylandOutput::setScale(qreal scale) | 101 | void AbstractWaylandOutput::setScale(qreal scale) | ||
| 102 | { | 102 | { | ||
| 103 | m_waylandOutputDevice->setScaleF(scale); | 103 | m_waylandOutputDevice->setScaleF(scale); | ||
| ▲ Show 20 Lines • Show All 167 Lines • Show Last 20 Lines | |||||
This comment remains true, only even more so