mirror of
https://github.com/crystalidea/qt-build-tools.git
synced 2024-11-26 12:37:11 +08:00
revert qt 5.6 cocoa original
This commit is contained in:
kleuter
parent
cd6caecceb
commit
d843bfe161
1894
5.6.0/qtbase/src/plugins/platforms/cocoa/qcocoawindow.mm
Normal file
1894
5.6.0/qtbase/src/plugins/platforms/cocoa/qcocoawindow.mm
Normal file
File diff suppressed because it is too large
Load Diff
147
5.6.0/qtbase/src/plugins/platforms/cocoa/qnsview.h
Normal file
147
5.6.0/qtbase/src/plugins/platforms/cocoa/qnsview.h
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2015 The Qt Company Ltd.
|
||||||
|
** Contact: http://www.qt.io/licensing/
|
||||||
|
**
|
||||||
|
** This file is part of the plugins of the Qt Toolkit.
|
||||||
|
**
|
||||||
|
** $QT_BEGIN_LICENSE:LGPL21$
|
||||||
|
** Commercial License Usage
|
||||||
|
** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
** accordance with the commercial license agreement provided with the
|
||||||
|
** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
** a written agreement between you and The Qt Company. For licensing terms
|
||||||
|
** and conditions see http://www.qt.io/terms-conditions. For further
|
||||||
|
** information use the contact form at http://www.qt.io/contact-us.
|
||||||
|
**
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
** General Public License version 2.1 or version 3 as published by the Free
|
||||||
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||||
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||||
|
** following information to ensure the GNU Lesser General Public License
|
||||||
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||||
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||||
|
**
|
||||||
|
** As a special exception, The Qt Company gives you certain additional
|
||||||
|
** rights. These rights are described in The Qt Company LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
** $QT_END_LICENSE$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#ifndef QNSVIEW_H
|
||||||
|
#define QNSVIEW_H
|
||||||
|
|
||||||
|
#include <Cocoa/Cocoa.h>
|
||||||
|
|
||||||
|
#include <QtCore/QPointer>
|
||||||
|
#include <QtGui/QImage>
|
||||||
|
#include <QtGui/QAccessible>
|
||||||
|
|
||||||
|
#include "private/qcore_mac_p.h"
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
class QCocoaWindow;
|
||||||
|
class QCocoaBackingStore;
|
||||||
|
class QCocoaGLContext;
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper));
|
||||||
|
|
||||||
|
@interface QT_MANGLE_NAMESPACE(QNSView) : NSView <NSTextInputClient> {
|
||||||
|
QCocoaBackingStore* m_backingStore;
|
||||||
|
QPoint m_backingStoreOffset;
|
||||||
|
CGImageRef m_maskImage;
|
||||||
|
uchar *m_maskData;
|
||||||
|
bool m_shouldInvalidateWindowShadow;
|
||||||
|
QPointer<QWindow> m_window;
|
||||||
|
QCocoaWindow *m_platformWindow;
|
||||||
|
NSTrackingArea *m_trackingArea;
|
||||||
|
Qt::MouseButtons m_buttons;
|
||||||
|
Qt::MouseButtons m_frameStrutButtons;
|
||||||
|
QString m_composingText;
|
||||||
|
bool m_sendKeyEvent;
|
||||||
|
QStringList *currentCustomDragTypes;
|
||||||
|
bool m_sendUpAsRightButton;
|
||||||
|
Qt::KeyboardModifiers currentWheelModifiers;
|
||||||
|
bool m_subscribesForGlobalFrameNotifications;
|
||||||
|
#ifndef QT_NO_OPENGL
|
||||||
|
QCocoaGLContext *m_glContext;
|
||||||
|
bool m_shouldSetGLContextinDrawRect;
|
||||||
|
#endif
|
||||||
|
NSString *m_inputSource;
|
||||||
|
QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper) *m_mouseMoveHelper;
|
||||||
|
bool m_resendKeyEvent;
|
||||||
|
bool m_scrolling;
|
||||||
|
bool m_updatingDrag;
|
||||||
|
bool m_exposedOnMoveToWindow;
|
||||||
|
NSEvent *m_currentlyInterpretedKeyEvent;
|
||||||
|
bool m_isMenuView;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (id)init;
|
||||||
|
- (id)initWithQWindow:(QWindow *)window platformWindow:(QCocoaWindow *) platformWindow;
|
||||||
|
- (void) clearQWindowPointers;
|
||||||
|
#ifndef QT_NO_OPENGL
|
||||||
|
- (void)setQCocoaGLContext:(QCocoaGLContext *)context;
|
||||||
|
#endif
|
||||||
|
- (void)flushBackingStore:(QCocoaBackingStore *)backingStore region:(const QRegion &)region offset:(QPoint)offset;
|
||||||
|
- (void)clearBackingStore:(QCocoaBackingStore *)backingStore;
|
||||||
|
- (void)setMaskRegion:(const QRegion *)region;
|
||||||
|
- (void)invalidateWindowShadowIfNeeded;
|
||||||
|
- (void)drawRect:(NSRect)dirtyRect;
|
||||||
|
- (void)updateGeometry;
|
||||||
|
- (void)notifyWindowStateChanged:(Qt::WindowState)newState;
|
||||||
|
- (void)windowNotification : (NSNotification *) windowNotification;
|
||||||
|
- (void)notifyWindowWillZoom:(BOOL)willZoom;
|
||||||
|
- (void)textInputContextKeyboardSelectionDidChangeNotification : (NSNotification *) textInputContextKeyboardSelectionDidChangeNotification;
|
||||||
|
- (void)viewDidHide;
|
||||||
|
- (void)viewDidUnhide;
|
||||||
|
- (void)removeFromSuperview;
|
||||||
|
|
||||||
|
- (BOOL)isFlipped;
|
||||||
|
- (BOOL)acceptsFirstResponder;
|
||||||
|
- (BOOL)becomeFirstResponder;
|
||||||
|
- (BOOL)hasMask;
|
||||||
|
- (BOOL)isOpaque;
|
||||||
|
|
||||||
|
- (void)convertFromScreen:(NSPoint)mouseLocation toWindowPoint:(QPointF *)qtWindowPoint andScreenPoint:(QPointF *)qtScreenPoint;
|
||||||
|
|
||||||
|
- (void)resetMouseButtons;
|
||||||
|
|
||||||
|
- (void)handleMouseEvent:(NSEvent *)theEvent;
|
||||||
|
- (void)mouseDown:(NSEvent *)theEvent;
|
||||||
|
- (void)mouseDragged:(NSEvent *)theEvent;
|
||||||
|
- (void)mouseUp:(NSEvent *)theEvent;
|
||||||
|
- (void)mouseMovedImpl:(NSEvent *)theEvent;
|
||||||
|
- (void)mouseEnteredImpl:(NSEvent *)theEvent;
|
||||||
|
- (void)mouseExitedImpl:(NSEvent *)theEvent;
|
||||||
|
- (void)cursorUpdateImpl:(NSEvent *)theEvent;
|
||||||
|
- (void)rightMouseDown:(NSEvent *)theEvent;
|
||||||
|
- (void)rightMouseDragged:(NSEvent *)theEvent;
|
||||||
|
- (void)rightMouseUp:(NSEvent *)theEvent;
|
||||||
|
- (void)otherMouseDown:(NSEvent *)theEvent;
|
||||||
|
- (void)otherMouseDragged:(NSEvent *)theEvent;
|
||||||
|
- (void)otherMouseUp:(NSEvent *)theEvent;
|
||||||
|
- (void)handleFrameStrutMouseEvent:(NSEvent *)theEvent;
|
||||||
|
|
||||||
|
- (void)handleTabletEvent: (NSEvent *)theEvent;
|
||||||
|
- (void)tabletPoint: (NSEvent *)theEvent;
|
||||||
|
- (void)tabletProximity: (NSEvent *)theEvent;
|
||||||
|
|
||||||
|
- (int) convertKeyCode : (QChar)keyCode;
|
||||||
|
+ (Qt::KeyboardModifiers) convertKeyModifiers : (ulong)modifierFlags;
|
||||||
|
- (void)handleKeyEvent:(NSEvent *)theEvent eventType:(int)eventType;
|
||||||
|
- (void)keyDown:(NSEvent *)theEvent;
|
||||||
|
- (void)keyUp:(NSEvent *)theEvent;
|
||||||
|
|
||||||
|
- (void)registerDragTypes;
|
||||||
|
- (NSDragOperation)handleDrag:(id <NSDraggingInfo>)sender;
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
||||||
|
QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSView);
|
||||||
|
|
||||||
|
#endif //QNSVIEW_H
|
||||||
@ -920,17 +920,7 @@ QT_WARNING_POP
|
|||||||
-(void)resetCursorRects
|
-(void)resetCursorRects
|
||||||
{
|
{
|
||||||
// Use the cursor rect API if there is a NSWindow
|
// Use the cursor rect API if there is a NSWindow
|
||||||
using QNSV = QT_MANGLE_NAMESPACE(QNSView);
|
if (m_platformWindow->m_nsWindow && m_platformWindow->m_windowCursor)
|
||||||
|
|
||||||
NSWindow *win = m_platformWindow->m_nsWindow;
|
|
||||||
NSView *pv = self.superview;
|
|
||||||
for (; !win && [pv isKindOfClass:[QNSV class]]; pv = pv.superview) {
|
|
||||||
auto platformWindow = static_cast<QNSV *>(pv)->m_platformWindow;
|
|
||||||
if (platformWindow)
|
|
||||||
win = platformWindow->m_nsWindow;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (win && m_platformWindow->m_windowCursor)
|
|
||||||
[self addCursorRect:[self visibleRect] cursor:m_platformWindow->m_windowCursor];
|
[self addCursorRect:[self visibleRect] cursor:m_platformWindow->m_windowCursor];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user