Changeset View
Changeset View
Standalone View
Standalone View
abstract_client.cpp
Show First 20 Lines • Show All 1415 Lines • ▼ Show 20 Line(s) | 1415 | [w, this] { | |||
---|---|---|---|---|---|
1416 | w->setParentWindow(transientFor() ? transientFor()->windowManagementInterface() : nullptr); | 1416 | w->setParentWindow(transientFor() ? transientFor()->windowManagementInterface() : nullptr); | ||
1417 | } | 1417 | } | ||
1418 | ); | 1418 | ); | ||
1419 | connect(this, &AbstractClient::frameGeometryChanged, w, | 1419 | connect(this, &AbstractClient::frameGeometryChanged, w, | ||
1420 | [w, this] { | 1420 | [w, this] { | ||
1421 | w->setGeometry(frameGeometry()); | 1421 | w->setGeometry(frameGeometry()); | ||
1422 | } | 1422 | } | ||
1423 | ); | 1423 | ); | ||
1424 | connect(this, &AbstractClient::applicationMenuChanged, w, | ||||
1425 | [w, this] { | ||||
1426 | w->setApplicationMenuPaths(applicationMenuServiceName(), applicationMenuObjectPath()); | ||||
zzag: Please remove "this->". | |||||
1427 | } | ||||
1428 | ); | ||||
1424 | connect(w, &PlasmaWindowInterface::closeRequested, this, [this] { closeWindow(); }); | 1429 | connect(w, &PlasmaWindowInterface::closeRequested, this, [this] { closeWindow(); }); | ||
1425 | connect(w, &PlasmaWindowInterface::moveRequested, this, | 1430 | connect(w, &PlasmaWindowInterface::moveRequested, this, | ||
1426 | [this] { | 1431 | [this] { | ||
1427 | Cursor::setPos(frameGeometry().center()); | 1432 | Cursor::setPos(frameGeometry().center()); | ||
1428 | performMouseCommand(Options::MouseMove, Cursor::pos()); | 1433 | performMouseCommand(Options::MouseMove, Cursor::pos()); | ||
1429 | } | 1434 | } | ||
1430 | ); | 1435 | ); | ||
1431 | connect(w, &PlasmaWindowInterface::resizeRequested, this, | 1436 | connect(w, &PlasmaWindowInterface::resizeRequested, this, | ||
▲ Show 20 Lines • Show All 1028 Lines • ▼ Show 20 Line(s) | |||||
2460 | void AbstractClient::updateApplicationMenuServiceName(const QString &serviceName) | 2465 | void AbstractClient::updateApplicationMenuServiceName(const QString &serviceName) | ||
2461 | { | 2466 | { | ||
2462 | const bool old_hasApplicationMenu = hasApplicationMenu(); | 2467 | const bool old_hasApplicationMenu = hasApplicationMenu(); | ||
2463 | 2468 | | |||
2464 | m_applicationMenuServiceName = serviceName; | 2469 | m_applicationMenuServiceName = serviceName; | ||
2465 | 2470 | | |||
2466 | const bool new_hasApplicationMenu = hasApplicationMenu(); | 2471 | const bool new_hasApplicationMenu = hasApplicationMenu(); | ||
2467 | 2472 | | |||
2473 | emit applicationMenuChanged(); | ||||
2468 | if (old_hasApplicationMenu != new_hasApplicationMenu) { | 2474 | if (old_hasApplicationMenu != new_hasApplicationMenu) { | ||
2469 | emit hasApplicationMenuChanged(new_hasApplicationMenu); | 2475 | emit hasApplicationMenuChanged(new_hasApplicationMenu); | ||
2470 | } | 2476 | } | ||
2471 | } | 2477 | } | ||
2472 | 2478 | | |||
2473 | void AbstractClient::updateApplicationMenuObjectPath(const QString &objectPath) | 2479 | void AbstractClient::updateApplicationMenuObjectPath(const QString &objectPath) | ||
2474 | { | 2480 | { | ||
2475 | const bool old_hasApplicationMenu = hasApplicationMenu(); | 2481 | const bool old_hasApplicationMenu = hasApplicationMenu(); | ||
2476 | 2482 | | |||
2477 | m_applicationMenuObjectPath = objectPath; | 2483 | m_applicationMenuObjectPath = objectPath; | ||
2478 | 2484 | | |||
2479 | const bool new_hasApplicationMenu = hasApplicationMenu(); | 2485 | const bool new_hasApplicationMenu = hasApplicationMenu(); | ||
2480 | 2486 | | |||
2487 | emit applicationMenuChanged(); | ||||
2481 | if (old_hasApplicationMenu != new_hasApplicationMenu) { | 2488 | if (old_hasApplicationMenu != new_hasApplicationMenu) { | ||
2482 | emit hasApplicationMenuChanged(new_hasApplicationMenu); | 2489 | emit hasApplicationMenuChanged(new_hasApplicationMenu); | ||
2483 | } | 2490 | } | ||
2484 | } | 2491 | } | ||
2485 | 2492 | | |||
2486 | void AbstractClient::setApplicationMenuActive(bool applicationMenuActive) | 2493 | void AbstractClient::setApplicationMenuActive(bool applicationMenuActive) | ||
2487 | { | 2494 | { | ||
2488 | if (m_applicationMenuActive != applicationMenuActive) { | 2495 | if (m_applicationMenuActive != applicationMenuActive) { | ||
▲ Show 20 Lines • Show All 806 Lines • Show Last 20 Lines |
Please remove "this->".