Changeset View
Changeset View
Standalone View
Standalone View
abstract_client.cpp
Show First 20 Lines • Show All 1407 Lines • ▼ Show 20 Line(s) | 1407 | [w, this] { | |||
---|---|---|---|---|---|
1408 | w->setParentWindow(transientFor() ? transientFor()->windowManagementInterface() : nullptr); | 1408 | w->setParentWindow(transientFor() ? transientFor()->windowManagementInterface() : nullptr); | ||
1409 | } | 1409 | } | ||
1410 | ); | 1410 | ); | ||
1411 | connect(this, &AbstractClient::frameGeometryChanged, w, | 1411 | connect(this, &AbstractClient::frameGeometryChanged, w, | ||
1412 | [w, this] { | 1412 | [w, this] { | ||
1413 | w->setGeometry(frameGeometry()); | 1413 | w->setGeometry(frameGeometry()); | ||
1414 | } | 1414 | } | ||
1415 | ); | 1415 | ); | ||
1416 | connect(this, &AbstractClient::applicationMenuChanged, w, | ||||
1417 | [w, this] { | ||||
1418 | w->setApplicationMenuPaths(applicationMenuServiceName(), applicationMenuObjectPath()); | ||||
zzag: Please remove "this->". | |||||
1419 | } | ||||
1420 | ); | ||||
1416 | connect(w, &PlasmaWindowInterface::closeRequested, this, [this] { closeWindow(); }); | 1421 | connect(w, &PlasmaWindowInterface::closeRequested, this, [this] { closeWindow(); }); | ||
1417 | connect(w, &PlasmaWindowInterface::moveRequested, this, | 1422 | connect(w, &PlasmaWindowInterface::moveRequested, this, | ||
1418 | [this] { | 1423 | [this] { | ||
1419 | Cursor::setPos(frameGeometry().center()); | 1424 | Cursor::setPos(frameGeometry().center()); | ||
1420 | performMouseCommand(Options::MouseMove, Cursor::pos()); | 1425 | performMouseCommand(Options::MouseMove, Cursor::pos()); | ||
1421 | } | 1426 | } | ||
1422 | ); | 1427 | ); | ||
1423 | connect(w, &PlasmaWindowInterface::resizeRequested, this, | 1428 | connect(w, &PlasmaWindowInterface::resizeRequested, this, | ||
▲ Show 20 Lines • Show All 1007 Lines • ▼ Show 20 Line(s) | |||||
2431 | void AbstractClient::updateApplicationMenuServiceName(const QString &serviceName) | 2436 | void AbstractClient::updateApplicationMenuServiceName(const QString &serviceName) | ||
2432 | { | 2437 | { | ||
2433 | const bool old_hasApplicationMenu = hasApplicationMenu(); | 2438 | const bool old_hasApplicationMenu = hasApplicationMenu(); | ||
2434 | 2439 | | |||
2435 | m_applicationMenuServiceName = serviceName; | 2440 | m_applicationMenuServiceName = serviceName; | ||
2436 | 2441 | | |||
2437 | const bool new_hasApplicationMenu = hasApplicationMenu(); | 2442 | const bool new_hasApplicationMenu = hasApplicationMenu(); | ||
2438 | 2443 | | |||
2444 | emit applicationMenuChanged(); | ||||
2439 | if (old_hasApplicationMenu != new_hasApplicationMenu) { | 2445 | if (old_hasApplicationMenu != new_hasApplicationMenu) { | ||
2440 | emit hasApplicationMenuChanged(new_hasApplicationMenu); | 2446 | emit hasApplicationMenuChanged(new_hasApplicationMenu); | ||
2441 | } | 2447 | } | ||
2442 | } | 2448 | } | ||
2443 | 2449 | | |||
2444 | void AbstractClient::updateApplicationMenuObjectPath(const QString &objectPath) | 2450 | void AbstractClient::updateApplicationMenuObjectPath(const QString &objectPath) | ||
2445 | { | 2451 | { | ||
2446 | const bool old_hasApplicationMenu = hasApplicationMenu(); | 2452 | const bool old_hasApplicationMenu = hasApplicationMenu(); | ||
2447 | 2453 | | |||
2448 | m_applicationMenuObjectPath = objectPath; | 2454 | m_applicationMenuObjectPath = objectPath; | ||
2449 | 2455 | | |||
2450 | const bool new_hasApplicationMenu = hasApplicationMenu(); | 2456 | const bool new_hasApplicationMenu = hasApplicationMenu(); | ||
2451 | 2457 | | |||
2458 | emit applicationMenuChanged(); | ||||
2452 | if (old_hasApplicationMenu != new_hasApplicationMenu) { | 2459 | if (old_hasApplicationMenu != new_hasApplicationMenu) { | ||
2453 | emit hasApplicationMenuChanged(new_hasApplicationMenu); | 2460 | emit hasApplicationMenuChanged(new_hasApplicationMenu); | ||
2454 | } | 2461 | } | ||
2455 | } | 2462 | } | ||
2456 | 2463 | | |||
2457 | void AbstractClient::setApplicationMenuActive(bool applicationMenuActive) | 2464 | void AbstractClient::setApplicationMenuActive(bool applicationMenuActive) | ||
2458 | { | 2465 | { | ||
2459 | if (m_applicationMenuActive != applicationMenuActive) { | 2466 | if (m_applicationMenuActive != applicationMenuActive) { | ||
▲ Show 20 Lines • Show All 806 Lines • Show Last 20 Lines |
Please remove "this->".