mirror of
https://github.com/crystalidea/qt6windows7.git
synced 2025-07-08 10:29:09 +08:00
qt 6.6.0 clean
This commit is contained in:
@ -7,114 +7,7 @@
|
||||
#include <private/qguiapplication_p.h>
|
||||
#include <qpa/qplatformintegration.h>
|
||||
|
||||
#if defined(Q_OS_MACOS)
|
||||
# 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
|
||||
#include "../../../../shared/nativewindow.h"
|
||||
|
||||
class tst_ForeignWindow: public QObject
|
||||
{
|
||||
@ -130,6 +23,8 @@ private slots:
|
||||
|
||||
void fromWinId();
|
||||
void initialState();
|
||||
|
||||
void embedForeignWindow();
|
||||
};
|
||||
|
||||
void tst_ForeignWindow::fromWinId()
|
||||
@ -165,6 +60,7 @@ void tst_ForeignWindow::initialState()
|
||||
|
||||
const QRect initialGeometry(123, 456, 321, 654);
|
||||
nativeWindow.setGeometry(initialGeometry);
|
||||
QTRY_COMPARE(nativeWindow.geometry(), initialGeometry);
|
||||
|
||||
std::unique_ptr<QWindow> foreignWindow(QWindow::fromWinId(nativeWindow));
|
||||
QCOMPARE(nativeWindow.geometry(), initialGeometry);
|
||||
@ -174,5 +70,22 @@ void tst_ForeignWindow::initialState()
|
||||
QCOMPARE(foreignWindow->geometry(), initialGeometry);
|
||||
}
|
||||
|
||||
void tst_ForeignWindow::embedForeignWindow()
|
||||
{
|
||||
// A foreign window embedded into a Qt UI requires that the rest of Qt
|
||||
// is to be able to treat the foreign child window as any other window
|
||||
// that it can show, hide, stack, and move around.
|
||||
|
||||
QWindow parentWindow;
|
||||
|
||||
NativeWindow nativeWindow;
|
||||
QVERIFY(nativeWindow);
|
||||
|
||||
// As a prerequisite to that, we must be able to reparent the foreign window
|
||||
std::unique_ptr<QWindow> foreignWindow(QWindow::fromWinId(nativeWindow));
|
||||
foreignWindow.release()->setParent(&parentWindow);
|
||||
QTRY_COMPARE(nativeWindow.parentWinId(), parentWindow.winId());
|
||||
}
|
||||
|
||||
#include <tst_foreignwindow.moc>
|
||||
QTEST_MAIN(tst_ForeignWindow)
|
||||
|
Reference in New Issue
Block a user