Differential D7246 Diff 23794 kdecoration-5.11.3/src/decorationbutton.cpp

Changeset View

Standalone View

View Options

kdecoration-5.11.3/src/decorationbutton.cpp

Context not available.
24#include "decoratedclient.h" 24​#include "decoratedclient.h"
25#include "decorationsettings.h" 25​#include "decorationsettings.h"
26 26​
27​#include <KLocalizedString>
28​
29​#include <QDebug>
27#include <QElapsedTimer> 30​#include <QElapsedTimer>
28#include <QHoverEvent> 31​#include <QHoverEvent>
29#include <QGuiApplication> 32​#include <QGuiApplication>
30#include <QStyleHints> 33​#include <QStyleHints>
31#include <QTimer> 34​#include <QTimer>
35​#include <QToolTip>
32 36​
33namespace KDecoration2 37​namespace KDecoration2
34{ 38​{
Context not available.
63{ 67​{
64 auto c = decoration->client().data(); 68​ auto c = decoration->client().data();
65 auto settings = decoration->settings(); 69​ auto settings = decoration->settings();
70​ QObject::connect(q, &DecorationButton::tooltip, decoration.data(), &Decoration::requestTooltip, Qt::QueuedConnection);
66 switch (type) { 71​ switch (type) {
67 case DecorationButtonType::Menu: 72​ case DecorationButtonType::Menu:
68 QObject::connect(q, &DecorationButton::clicked, decoration.data(), &Decoration::requestShowWindowMenu, Qt::QueuedConnection); 73​ QObject::connect(q, &DecorationButton::clicked, decoration.data(), &Decoration::requestShowWindowMenu, Qt::QueuedConnection);
Context not available.
293 this, static_cast<void (DecorationButton::*)(const QRectF&)>(&DecorationButton::update)); 298​ this, static_cast<void (DecorationButton::*)(const QRectF&)>(&DecorationButton::update));
294 auto updateSlot = static_cast<void (DecorationButton::*)()>(&DecorationButton::update); 299​ auto updateSlot = static_cast<void (DecorationButton::*)()>(&DecorationButton::update);
295 connect(this, &DecorationButton::hoveredChanged, this, updateSlot); 300​ connect(this, &DecorationButton::hoveredChanged, this, updateSlot);
301​ connect(this, &DecorationButton::hoveredChanged, this, &DecorationButton::showTooltip);
graesslinUnsubmitted
Done

If I see correctly this could become a lambda function which would not require to add a showTooltip method

graesslin: If I see correctly this could become a lambda function which would not require to add a…
296 connect(this, &DecorationButton::pressedChanged, this, updateSlot); 302​ connect(this, &DecorationButton::pressedChanged, this, updateSlot);
297 connect(this, &DecorationButton::checkedChanged, this, updateSlot); 303​ connect(this, &DecorationButton::checkedChanged, this, updateSlot);
298 connect(this, &DecorationButton::enabledChanged, this, updateSlot); 304​ connect(this, &DecorationButton::enabledChanged, this, updateSlot);
Context not available.
496 Q_UNUSED(event) 502​ Q_UNUSED(event)
497} 503​}
498 504​
505​void DecorationButton::showTooltip( bool hovered )
506​{
507​
508​ //TODO: show tooltip if hovered and hide if not
509​ const QString& type = typeToString(this->type());
510​
511​ //TODO: change offset to something valuable
512​ emit tooltip(type, hovered);
graesslinUnsubmitted
Done

Instead of emitting the signal please invoke the method requestShowTooltip directly (I don't think we need to queue it)

graesslin: Instead of emitting the signal please invoke the method requestShowTooltip directly (I don't…
513​
514​}
515​
516​QString DecorationButton::typeToString( DecorationButtonType type )
517​{
518​
519​ switch (type) {
520​ case DecorationButtonType::Menu:
521​ return i18n("Menu");
522​ case DecorationButtonType::ApplicationMenu:
523​ return i18n("Application menu");
524​ case DecorationButtonType::OnAllDesktops:
525​ if ( isChecked() )
526​ return i18n("On one desktop");
527​ else
528​ return i18n("On all desktops");
529​ case DecorationButtonType::Minimize:
530​ return i18n("Minimize");
531​ case DecorationButtonType::Maximize:
532​ if ( isChecked() )
533​ return i18n("Restore");
534​ else
535​ return i18n("Maximize");
536​ case DecorationButtonType::Close:
537​ return i18n("Close");
538​ case DecorationButtonType::ContextHelp:
539​ return i18n("Context help");
540​ case DecorationButtonType::Shade:
541​ if ( isChecked() )
542​ return i18n("Unshade");
543​ else
544​ return i18n("Shade");
545​ case DecorationButtonType::KeepBelow:
546​ if ( isChecked() )
547​ return i18n("Don't keep below");
548​ else
549​ return i18n("Keep below");
550​ case DecorationButtonType::KeepAbove:
551​ if ( isChecked() )
552​ return i18n("Don't keep above");
553​ else
554​ return i18n("Keep above");
555​ default:
556​ return QString();
557​ }
558​
559​}
560​
499} 561​}
Context not available.