From e05edc38702f1f1ab2e4e581f421891245efe8b8 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 17 12月 2023 00:30:30 +0800
Subject: [PATCH] Remove redundant file
---
/dev/null | 100 --------------------------------------------------
src/core/contexts/cocoawindowcontext.mm | 2
src/widgets/widgetwindowagent.cpp | 3 -
src/widgets/CMakeLists.txt | 4 --
src/widgets/widgetwindowagent_p.h | 2 -
5 files changed, 1 insertions(+), 110 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index aec1f20..f8a45d5 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -104,7 +104,7 @@
nswindow.hasShadow = YES;
nswindow.showsToolbarButton = NO;
nswindow.movableByWindowBackground = NO;
- // nswindow.movable = NO; // This line causes the window in the wrong position when
+ nswindow.movable = NO; // This line causes the window in the wrong position when
// become fullscreen.
// For some unknown reason, we don't need the following hack in Qt versions below or
// equal to 6.2.4.
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index dfcedd1..5cdb2c2 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -14,10 +14,6 @@
if(WIN32)
list(APPEND _src widgetwindowagent_win.cpp)
-elseif(APPLE)
- list(APPEND _src widgetwindowagent_cocoa.cpp)
-else()
- list(APPEND _src widgetwindowagent_qt.cpp)
endif()
qwk_add_library(${PROJECT_NAME} AUTOGEN
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index af15481..8b6988e 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -57,9 +57,6 @@
if (!d->context->setTitleBar(w)) {
return;
}
-#ifdef Q_OS_MACOS
- d->setupMacOSTitleBar(w);
-#endif
Q_EMIT titleBarWidgetChanged(w);
}
diff --git a/src/widgets/widgetwindowagent_cocoa.cpp b/src/widgets/widgetwindowagent_cocoa.cpp
deleted file mode 100644
index cccb5fe..0000000
--- a/src/widgets/widgetwindowagent_cocoa.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-#include "widgetwindowagent_p.h"
-
-#include <QtCore/QDebug>
-
-namespace QWK {
-
- class TitleBarEventFilter : public QObject {
- public:
- explicit TitleBarEventFilter(AbstractWindowContext *context, QObject *parent = nullptr);
- ~TitleBarEventFilter() override;
-
- protected:
- bool eventFilter(QObject *object, QEvent *event) override;
-
- private:
- AbstractWindowContext *m_context;
- bool m_leftButtonPressed;
- bool m_moving;
- };
-
- TitleBarEventFilter::TitleBarEventFilter(AbstractWindowContext *context, QObject *parent)
- : QObject(parent), m_context(context), m_leftButtonPressed(false), m_moving(false) {
- }
-
- TitleBarEventFilter::~TitleBarEventFilter() = default;
-
- bool TitleBarEventFilter::eventFilter(QObject *object, QEvent *event) {
- const auto type = event->type();
- if (type < QEvent::MouseButtonPress || type > QEvent::MouseMove) {
- return false;
- }
- const auto me = static_cast<const QMouseEvent *>(event);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- const QPoint scenePos = mouseEvent->scenePosition().toPoint();
- const QPoint globalPos = mouseEvent->globalPosition().toPoint();
-#else
- const QPoint scenePos = me->windowPos().toPoint();
- const QPoint globalPos = me->screenPos().toPoint();
-#endif
- if (!m_context->isInTitleBarDraggableArea(scenePos)) {
- return false;
- }
- switch (type) {
- case QEvent::MouseButtonPress: {
- if (me->button() == Qt::LeftButton) {
- m_leftButtonPressed = true;
- m_moving = false;
- event->accept();
- return true;
- }
- break;
- }
- case QEvent::MouseButtonRelease: {
- if (me->button() == Qt::LeftButton) {
- m_leftButtonPressed = false;
- m_moving = false;
- event->accept();
- return true;
- }
- break;
- }
- case QEvent::MouseMove: {
- if (m_leftButtonPressed) {
- if (!m_moving) {
- m_moving = true;
- m_context->window()->startSystemMove();
- }
- event->accept();
- return true;
- }
- break;
- }
- case QEvent::MouseButtonDblClick: {
- if (me->button() == Qt::LeftButton) {
- auto window = static_cast<QWidget *>(object)->window();
- if (!window->isFullScreen()) {
- if (window->isMaximized()) {
- window->showNormal();
- } else {
- window->showMaximized();
- }
- event->accept();
- return true;
- }
- }
- break;
- }
- default: {
- Q_UNREACHABLE();
- return false;
- }
- }
- return false;
- }
-
- void WidgetWindowAgentPrivate::setupMacOSTitleBar(QWidget *titleBar) {
- titleBar->installEventFilter(new TitleBarEventFilter(context.get(), titleBar));
- }
-
-}
diff --git a/src/widgets/widgetwindowagent_p.h b/src/widgets/widgetwindowagent_p.h
index 36bb202..8fee638 100644
--- a/src/widgets/widgetwindowagent_p.h
+++ b/src/widgets/widgetwindowagent_p.h
@@ -19,8 +19,6 @@
#ifdef Q_OS_WINDOWS
void setupWindows10BorderWorkaround();
-#elif defined(Q_OS_MACOS)
- void setupMacOSTitleBar(QWidget *titleBar);
#endif
};
--
Gitblit v1.9.1