Run clang-format again
Some people either don't have clang-format installed or disable the commit hook.
This commit is contained in:
parent
2c1d36e8c5
commit
4790408423
10 changed files with 29 additions and 22 deletions
|
@ -1436,7 +1436,6 @@ void TestXdgShellClientRules::testDesktopsForce()
|
|||
QCOMPARE(m_client->desktops(), {vd2});
|
||||
QCOMPARE(VirtualDesktopManager::self()->currentDesktop(), vd2);
|
||||
|
||||
|
||||
// Any attempt to move the client to another virtual desktop should fail.
|
||||
m_client->setDesktops({vd1});
|
||||
QCOMPARE(m_client->desktops(), {vd2});
|
||||
|
|
|
@ -38,7 +38,7 @@ void InputRedirection::registerTouchpadSwipeShortcut(SwipeDirection, uint finger
|
|||
{
|
||||
}
|
||||
|
||||
void InputRedirection::registerTouchscreenSwipeShortcut(SwipeDirection, uint fingerCount, QAction*)
|
||||
void InputRedirection::registerTouchscreenSwipeShortcut(SwipeDirection, uint fingerCount, QAction *)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -336,7 +336,8 @@ public:
|
|||
{
|
||||
return 0;
|
||||
}
|
||||
QUuid internalId() const override {
|
||||
QUuid internalId() const override
|
||||
{
|
||||
return QUuid();
|
||||
}
|
||||
|
||||
|
|
|
@ -800,7 +800,7 @@ xcb_timestamp_t X11Client::readUserTimeMapTimestamp(const KStartupInfoId *asn_id
|
|||
};
|
||||
if (act->hasTransient(this, true)) {
|
||||
; // is transient for currently active window, even though it's not
|
||||
// the same app (e.g. kcookiejar dialog) -> allow activation
|
||||
// the same app (e.g. kcookiejar dialog) -> allow activation
|
||||
} else if (groupTransient() && findInList<X11Client, X11Client>(clientMainClients(), sameApplicationActiveHackPredicate) == nullptr) {
|
||||
; // standalone transient
|
||||
} else {
|
||||
|
|
|
@ -11,11 +11,12 @@
|
|||
#pragma once
|
||||
#include "drm_pointer.h"
|
||||
|
||||
#include <xf86drmMode.h>
|
||||
#include <QByteArray>
|
||||
#include <QMap>
|
||||
#include <QVector>
|
||||
|
||||
#include <xf86drmMode.h>
|
||||
|
||||
namespace KWin
|
||||
{
|
||||
|
||||
|
|
|
@ -139,11 +139,10 @@ EffectsHandlerImpl::EffectsHandlerImpl(Compositor *compositor, Scene *scene)
|
|||
|
||||
Workspace *ws = Workspace::self();
|
||||
VirtualDesktopManager *vds = VirtualDesktopManager::self();
|
||||
connect(ws, &Workspace::showingDesktopChanged, this,
|
||||
[this](bool showing, bool animated) {
|
||||
if (animated) {
|
||||
Q_EMIT showingDesktopChanged(showing);
|
||||
}
|
||||
connect(ws, &Workspace::showingDesktopChanged, this, [this](bool showing, bool animated) {
|
||||
if (animated) {
|
||||
Q_EMIT showingDesktopChanged(showing);
|
||||
}
|
||||
});
|
||||
connect(ws, &Workspace::currentDesktopChanged, this, [this](int old, AbstractClient *c) {
|
||||
const int newDesktop = VirtualDesktopManager::self()->current();
|
||||
|
|
|
@ -39,10 +39,10 @@ WindowViewEffect::~WindowViewEffect()
|
|||
|
||||
QVariantMap WindowViewEffect::initialProperties(EffectScreen *screen)
|
||||
{
|
||||
return QVariantMap {
|
||||
{ QStringLiteral("effect"), QVariant::fromValue(this) },
|
||||
{ QStringLiteral("targetScreen"), QVariant::fromValue(screen) },
|
||||
{ QStringLiteral("selectedIds"), QVariant::fromValue(m_windowIds) },
|
||||
return QVariantMap{
|
||||
{QStringLiteral("effect"), QVariant::fromValue(this)},
|
||||
{QStringLiteral("targetScreen"), QVariant::fromValue(screen)},
|
||||
{QStringLiteral("selectedIds"), QVariant::fromValue(m_windowIds)},
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#if KWIN_BUILD_TABBOX
|
||||
#include "tabbox/tabbox.h"
|
||||
#endif
|
||||
#include "abstract_output.h"
|
||||
#include "cursor.h"
|
||||
#include "internal_client.h"
|
||||
#include "platform.h"
|
||||
|
@ -42,7 +43,6 @@
|
|||
#include "wayland_server.h"
|
||||
#include "workspace.h"
|
||||
#include "xwl/xwayland_interface.h"
|
||||
#include "abstract_output.h"
|
||||
|
||||
#include <KDecoration2/Decoration>
|
||||
#include <KGlobalAccel>
|
||||
|
@ -1054,7 +1054,8 @@ public:
|
|||
input()->shortcuts()->processPinchCancel();
|
||||
return false;
|
||||
}
|
||||
bool touchDown(qint32 id, const QPointF &pos, quint32 time) override {
|
||||
bool touchDown(qint32 id, const QPointF &pos, quint32 time) override
|
||||
{
|
||||
if (m_gestureTaken) {
|
||||
input()->shortcuts()->processSwipeCancel(DeviceType::Touchscreen);
|
||||
m_gestureCancelled = true;
|
||||
|
@ -1091,7 +1092,8 @@ public:
|
|||
return false;
|
||||
}
|
||||
|
||||
bool touchMotion(qint32 id, const QPointF &pos, quint32 time) override {
|
||||
bool touchMotion(qint32 id, const QPointF &pos, quint32 time) override
|
||||
{
|
||||
Q_UNUSED(time);
|
||||
if (m_gestureTaken) {
|
||||
if (m_gestureCancelled) {
|
||||
|
@ -1115,7 +1117,8 @@ public:
|
|||
return false;
|
||||
}
|
||||
|
||||
bool touchUp(qint32 id, quint32 time) override {
|
||||
bool touchUp(qint32 id, quint32 time) override
|
||||
{
|
||||
Q_UNUSED(time);
|
||||
m_touchPoints.remove(id);
|
||||
if (m_gestureTaken) {
|
||||
|
@ -1131,12 +1134,14 @@ public:
|
|||
return false;
|
||||
}
|
||||
|
||||
bool touchFrame() override {
|
||||
bool touchFrame() override
|
||||
{
|
||||
return m_gestureTaken;
|
||||
}
|
||||
|
||||
private:
|
||||
struct TouchPoint {
|
||||
struct TouchPoint
|
||||
{
|
||||
QPointF pos;
|
||||
QSize distance;
|
||||
};
|
||||
|
|
|
@ -166,7 +166,7 @@ void RootInfo::changeActiveWindow(xcb_window_t w, NET::RequestSource src, xcb_ti
|
|||
X11Client *c2;
|
||||
if (workspace->allowClientActivation(c, timestamp, false, true)) {
|
||||
workspace->activateClient(c);
|
||||
// if activation of the requestor's window would be allowed, allow activation too
|
||||
// if activation of the requestor's window would be allowed, allow activation too
|
||||
} else if (active_window != XCB_WINDOW_NONE
|
||||
&& (c2 = workspace->findClient(Predicate::WindowMatch, active_window)) != nullptr
|
||||
&& workspace->allowClientActivation(c2,
|
||||
|
|
|
@ -357,7 +357,9 @@ void NightColorManager::resetQuickAdjustTimer(int targetTemp)
|
|||
cancelAllTimers();
|
||||
m_quickAdjustTimer = new QTimer(this);
|
||||
m_quickAdjustTimer->setSingleShot(false);
|
||||
connect(m_quickAdjustTimer, &QTimer::timeout, this, [this, targetTemp]() { quickAdjust(targetTemp); });
|
||||
connect(m_quickAdjustTimer, &QTimer::timeout, this, [this, targetTemp]() {
|
||||
quickAdjust(targetTemp);
|
||||
});
|
||||
|
||||
int interval = (QUICK_ADJUST_DURATION / (m_previewTimer && m_previewTimer->isActive() ? 8 : 1)) / (tempDiff / TEMPERATURE_STEP);
|
||||
if (interval == 0) {
|
||||
|
|
Loading…
Reference in a new issue