Differential D7246 Diff 23857 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::showtooltip, decoration.data(), &Decoration::requestShowToolTip, Qt::QueuedConnection);
71​ QObject::connect(q, &DecorationButton::hidetooltip, decoration.data(), &Decoration::requestHideToolTip, Qt::QueuedConnection);
66 switch (type) { 72​ switch (type) {
67 case DecorationButtonType::Menu: 73​ case DecorationButtonType::Menu:
68 QObject::connect(q, &DecorationButton::clicked, decoration.data(), &Decoration::requestShowWindowMenu, Qt::QueuedConnection); 74​ QObject::connect(q, &DecorationButton::clicked, decoration.data(), &Decoration::requestShowWindowMenu, Qt::QueuedConnection);
Context not available.
293 this, static_cast<void (DecorationButton::*)(const QRectF&)>(&DecorationButton::update)); 299​ this, static_cast<void (DecorationButton::*)(const QRectF&)>(&DecorationButton::update));
294 auto updateSlot = static_cast<void (DecorationButton::*)()>(&DecorationButton::update); 300​ auto updateSlot = static_cast<void (DecorationButton::*)()>(&DecorationButton::update);
295 connect(this, &DecorationButton::hoveredChanged, this, updateSlot); 301​ connect(this, &DecorationButton::hoveredChanged, this, updateSlot);
302​ 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); 303​ connect(this, &DecorationButton::pressedChanged, this, updateSlot);
297 connect(this, &DecorationButton::checkedChanged, this, updateSlot); 304​ connect(this, &DecorationButton::checkedChanged, this, updateSlot);
298 connect(this, &DecorationButton::enabledChanged, this, updateSlot); 305​ connect(this, &DecorationButton::enabledChanged, this, updateSlot);
Context not available.
496 Q_UNUSED(event) 503​ Q_UNUSED(event)
497} 504​}
498 505​
506​void DecorationButton::showTooltip( bool hovered )
507​{
508​
509​ //TODO: show tooltip if hovered and hide if not
510​ const QString& type = typeToString(this->type());
511​
512​ //TODO: change offset to something valuable
513​ hovered ? emit showtooltip(type) : hidetooltip();
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…
514​
515​}
516​
517​QString DecorationButton::typeToString( DecorationButtonType type )
518​{
519​
520​ switch (type) {
521​ case DecorationButtonType::Menu:
522​ return i18n("Menu");
523​ case DecorationButtonType::ApplicationMenu:
524​ return i18n("Application menu");
525​ case DecorationButtonType::OnAllDesktops:
526​ if ( isChecked() )
527​ return i18n("On one desktop");
528​ else
529​ return i18n("On all desktops");
530​ case DecorationButtonType::Minimize:
531​ return i18n("Minimize");
532​ case DecorationButtonType::Maximize:
533​ if ( isChecked() )
534​ return i18n("Restore");
535​ else
536​ return i18n("Maximize");
537​ case DecorationButtonType::Close:
538​ return i18n("Close");
539​ case DecorationButtonType::ContextHelp:
540​ return i18n("Context help");
541​ case DecorationButtonType::Shade:
542​ if ( isChecked() )
543​ return i18n("Unshade");
544​ else
545​ return i18n("Shade");
546​ case DecorationButtonType::KeepBelow:
547​ if ( isChecked() )
548​ return i18n("Don't keep below");
549​ else
550​ return i18n("Keep below");
551​ case DecorationButtonType::KeepAbove:
552​ if ( isChecked() )
553​ return i18n("Don't keep above");
554​ else
555​ return i18n("Keep above");
556​ default:
557​ return QString();
558​ }
559​
560​}
561​
499} 562​}
Context not available.