Changeset View
Changeset View
Standalone View
Standalone View
applets/appmenu/plugin/appmenumodel.cpp
| Show First 20 Lines • Show All 254 Lines • ▼ Show 20 Line(s) | |||||
| 255 | #endif | 255 | #endif | ||
| 256 | 256 | | |||
| 257 | } | 257 | } | ||
| 258 | 258 | | |||
| 259 | void AppMenuModel::onWindowChanged(WId id) | 259 | void AppMenuModel::onWindowChanged(WId id) | ||
| 260 | { | 260 | { | ||
| 261 | if (m_currentWindowId == id) { | 261 | if (m_currentWindowId == id) { | ||
| 262 | KWindowInfo info(id, NET::WMState | NET::WMGeometry); | 262 | KWindowInfo info(id, NET::WMState | NET::WMGeometry); | ||
| 263 | const bool contained = m_screenGeometry.isNull() || m_screenGeometry.contains(info.geometry().center()); | 263 | | ||
| 264 | //! HACK: if the user has enabled PLASMA_USE_QT_SCALING under X11 environment | ||||
| 265 | //! then the window and screen geometries can not be trusted for comparison. | ||||
| 266 | //! In such case the global menu should be shown at all cases and not become hidden | ||||
| 267 | //! from geometries comparison. | ||||
| 268 | //! BUG: 404500 | ||||
| 269 | const bool untrustedGeometries = KWindowSystem::isPlatformX11() && qEnvironmentVariableIsSet("PLASMA_USE_QT_SCALING"); | ||||
| 270 | const bool contained = m_screenGeometry.isNull() || m_screenGeometry.contains(info.geometry().center()) || untrustedGeometries; | ||||
| 264 | 271 | | |||
| 265 | setVisible(contained && !info.isMinimized()); | 272 | setVisible(contained && !info.isMinimized()); | ||
| 266 | } | 273 | } | ||
| 267 | } | 274 | } | ||
| 268 | 275 | | |||
| 269 | QHash<int, QByteArray> AppMenuModel::roleNames() const | 276 | QHash<int, QByteArray> AppMenuModel::roleNames() const | ||
| 270 | { | 277 | { | ||
| 271 | QHash<int, QByteArray> roleNames; | 278 | QHash<int, QByteArray> roleNames; | ||
| ▲ Show 20 Lines • Show All 124 Lines • Show Last 20 Lines | |||||