1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Move NativeWindow helper class to shared header

Browse Source 
Change-Id: Ia7dc54aa761fdfde42d49a41475a4fbc74036aeb
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 5e6d46a9f7055163182b080f0daea063889bfbd7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2023-08-01 16:41:21 +02:00 committed by Qt Cherry-pick Bot
parent e3f1695143
commit a2f0d82503
2 changed files with 113 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
tests/auto/gui/kernel/qwindow/tst_foreignwindow.cpp
View File

@ -7,114 +7,7 @@
#include <private/qguiapplication_p.h> #include <private/qguiapplication_p.h>
#include <qpa/qplatformintegration.h> #include <qpa/qplatformintegration.h>
#if defined(Q_OS_MACOS) #include "../../../../shared/nativewindow.h"
# include <AppKit/AppKit.h>
#elif defined(Q_OS_WIN)
# include <winuser.h>
#endif
Q_LOGGING_CATEGORY(lcTests, "qt.gui.tests")
class NativeWindow
{
Q_DISABLE_COPY(NativeWindow)
public:
NativeWindow();
~NativeWindow();
operator WId() const { return reinterpret_cast<WId>(m_handle); }
void setGeometry(const QRect &rect);
QRect geometry() const;
private:
#if defined(Q_OS_MACOS)
NSView *m_handle = nullptr;
#elif defined(Q_OS_WIN)
HWND m_handle = nullptr;
#endif
};
#if defined(Q_OS_MACOS)
@interface View : NSView
@end
@implementation View
- (instancetype)init
{
if ((self = [super init])) {
qCDebug(lcTests) << "Initialized" << self;
}
return self;
}
- (void)dealloc
{
qCDebug(lcTests) << "Deallocating" << self;
[super dealloc];
}
@end
NativeWindow::NativeWindow()
: m_handle([View new])
{
}
NativeWindow::~NativeWindow()
{
[m_handle release];
}
void NativeWindow::setGeometry(const QRect &rect)
{
m_handle.frame = QRectF(rect).toCGRect();
}
QRect NativeWindow::geometry() const
{
return QRectF::fromCGRect(m_handle.frame).toRect();
}
#elif defined(Q_OS_WIN)
NativeWindow::NativeWindow()
{
static const LPCWSTR className = []{
WNDCLASS wc = {};
wc.lpfnWndProc = DefWindowProc;
wc.hInstance = GetModuleHandle(nullptr);
wc.lpszClassName = L"Native Window";
RegisterClass(&wc);
return wc.lpszClassName;
}();
m_handle = CreateWindowEx(0, className, nullptr, WS_POPUP,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
nullptr, nullptr, GetModuleHandle(nullptr), nullptr);
}
NativeWindow::~NativeWindow()
{
DestroyWindow(m_handle);
}
void NativeWindow::setGeometry(const QRect &rect)
{
MoveWindow(m_handle, rect.x(), rect.y(), rect.width(), rect.height(), false);
}
QRect NativeWindow::geometry() const
{
WINDOWPLACEMENT wp;
wp.length = sizeof(WINDOWPLACEMENT);
if (GetWindowPlacement(m_handle, &wp)) {
RECT r = wp.rcNormalPosition;
return QRect(r.left, r.top, r.right - r.left, r.bottom - r.top);
}
return {};
}
#endif
class tst_ForeignWindow: public QObject class tst_ForeignWindow: public QObject
{ {

112
tests/shared/nativewindow.h Normal file
View File

@ -0,0 +1,112 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef NATIVEWINDOW_H
#define NATIVEWINDOW_H
#if defined(Q_OS_MACOS)
# include <AppKit/AppKit.h>
#elif defined(Q_OS_WIN)
# include <winuser.h>
#endif
class NativeWindow
{
Q_DISABLE_COPY(NativeWindow)
public:
NativeWindow();
~NativeWindow();
operator WId() const { return reinterpret_cast<WId>(m_handle); }
void setGeometry(const QRect &rect);
QRect geometry() const;
private:
#if defined(Q_OS_MACOS)
NSView *m_handle = nullptr;
#elif defined(Q_OS_WIN)
HWND m_handle = nullptr;
#endif
};
#if defined(Q_OS_MACOS)
@interface View : NSView
@end
@implementation View
- (instancetype)init
{
if ((self = [super init])) {
}
return self;
}
- (void)dealloc
{
[super dealloc];
}
@end
NativeWindow::NativeWindow()
: m_handle([View new])
{
}
NativeWindow::~NativeWindow()
{
[m_handle release];
}
void NativeWindow::setGeometry(const QRect &rect)
{
m_handle.frame = QRectF(rect).toCGRect();
}
QRect NativeWindow::geometry() const
{
return QRectF::fromCGRect(m_handle.frame).toRect();
}
#elif defined(Q_OS_WIN)
NativeWindow::NativeWindow()
{
static const LPCWSTR className = []{
WNDCLASS wc = {};
wc.lpfnWndProc = DefWindowProc;
wc.hInstance = GetModuleHandle(nullptr);
wc.lpszClassName = L"Native Window";
RegisterClass(&wc);
return wc.lpszClassName;
}();
m_handle = CreateWindowEx(0, className, nullptr, WS_POPUP,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
nullptr, nullptr, GetModuleHandle(nullptr), nullptr);
}
NativeWindow::~NativeWindow()
{
DestroyWindow(m_handle);
}
void NativeWindow::setGeometry(const QRect &rect)
{
MoveWindow(m_handle, rect.x(), rect.y(), rect.width(), rect.height(), false);
}
QRect NativeWindow::geometry() const
{
WINDOWPLACEMENT wp;
wp.length = sizeof(WINDOWPLACEMENT);
if (GetWindowPlacement(m_handle, &wp)) {
RECT r = wp.rcNormalPosition;
return QRect(r.left, r.top, r.right - r.left, r.bottom - r.top);
}
return {};
}
#endif
#endif // NATIVEWINDOW_H