diff options
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index fb91c53a7a..feaade1bd6 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -112,6 +112,7 @@ public: void raise() override; void lower() override; bool isExposed() const override; + bool isEmbedded() const override; bool isOpaque() const; void propagateSizeHints() override; void setOpacity(qreal level) override; @@ -124,6 +125,8 @@ public: bool isForeignWindow() const override; void requestUpdate() override; + void deliverUpdateRequest() override; + void requestActivateWindow() override; WId winId() const override; @@ -132,7 +135,7 @@ public: NSView *view() const; NSWindow *nativeWindow() const; - void setEmbeddedInForeignView(bool subwindow); + void setEmbeddedInForeignView(); Q_NOTIFICATION_HANDLER(NSViewFrameDidChangeNotification) void viewDidChangeFrame(); Q_NOTIFICATION_HANDLER(NSViewGlobalFrameDidChangeNotification) void viewDidChangeGlobalFrame(); @@ -237,11 +240,6 @@ public: // for QNSView NSView *m_view; QCocoaNSWindow *m_nsWindow; - // TODO merge to one variable if possible - bool m_viewIsEmbedded; // true if the m_view is actually embedded in a "foreign" NSView hiearchy - bool m_viewIsToBeEmbedded; // true if the m_view is intended to be embedded in a "foreign" NSView hiearchy - - Qt::WindowFlags m_windowFlags; Qt::WindowStates m_lastReportedWindowState; Qt::WindowModality m_windowModality; QPointer<QWindow> m_enterLeaveTargetWindow; |