QMacStyle doesn't depend on Carbon anymore
We also remove the old documentation file that is now mostly outdated. Change-Id: I32c9c6b0984be5e41653a92b0b9287a89f73ee38 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>bb10
Gabriel de Dietrich
parent
9c4c136bc9
commit
38a16b8be0
|
|
@ -10,7 +10,7 @@ HEADERS += \
|
|||
qmacstyle_mac_p.h \
|
||||
qmacstyle_mac_p_p.h
|
||||
|
||||
LIBS_PRIVATE += -framework AppKit -framework ApplicationServices -framework Carbon
|
||||
LIBS_PRIVATE += -framework AppKit
|
||||
|
||||
DISTFILES += macstyle.json
|
||||
|
||||
|
|
|
|||
|
|
@ -1,207 +0,0 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the documentation of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:FDL$
|
||||
** 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 https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU Free Documentation License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Free
|
||||
** Documentation License version 1.3 as published by the Free Software
|
||||
** Foundation and appearing in the file included in the packaging of
|
||||
** this file. Please review the following information to ensure
|
||||
** the GNU Free Documentation License version 1.3 requirements
|
||||
** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
/*!
|
||||
\class QMacStyle
|
||||
\brief The QMacStyle class provides a \macos style using the Apple Appearance Manager.
|
||||
|
||||
\ingroup appearance
|
||||
\inmodule QtWidgets
|
||||
\internal
|
||||
|
||||
This class is implemented as a wrapper to the HITheme
|
||||
APIs, allowing applications to be styled according to the current
|
||||
theme in use on \macos. This is done by having primitives
|
||||
in QStyle implemented in terms of what \macos would normally theme.
|
||||
|
||||
\warning This style is only available on \macos because it relies on the
|
||||
HITheme APIs.
|
||||
|
||||
There are additional issues that should be taken
|
||||
into consideration to make an application compatible with the
|
||||
\l{Apple Human Interface Guidelines}{Apple Human Interface Guidelines}. Some of these issues are outlined
|
||||
below.
|
||||
|
||||
\list
|
||||
|
||||
\li Layout - The restrictions on window layout are such that some
|
||||
aspects of layout that are style-dependent cannot be achieved
|
||||
using QLayout. Changes are being considered (and feedback would be
|
||||
appreciated) to make layouts QStyle-able. Some of the restrictions
|
||||
involve horizontal and vertical widget alignment and widget size
|
||||
(covered below).
|
||||
|
||||
\li Widget size - \macos allows widgets to have specific fixed sizes. Qt
|
||||
does not fully implement this behavior so as to maintain cross-platform
|
||||
compatibility. As a result some widgets sizes may be inappropriate (and
|
||||
subsequently not rendered correctly by the HITheme APIs).The
|
||||
QWidget::sizeHint() will return the appropriate size for many
|
||||
managed widgets (widgets enumerated in \l QStyle::ContentsType).
|
||||
|
||||
\li Effects - QMacStyle uses HITheme for performing most of the drawing, but
|
||||
also uses emulation in a few cases where HITheme does not provide the
|
||||
required functionality (for example, tab bars on Panther, the toolbar
|
||||
separator, etc). We tried to make the emulation as close to the original as
|
||||
possible. Please report any issues you see in effects or non-standard
|
||||
widgets.
|
||||
|
||||
\endlist
|
||||
|
||||
There are other issues that need to be considered in the feel of
|
||||
your application (including the general color scheme to match the
|
||||
Aqua colors). The Guidelines mentioned above will remain current
|
||||
with new advances and design suggestions for \macos.
|
||||
|
||||
Note that the functions provided by QMacStyle are
|
||||
reimplementations of QStyle functions; see QStyle for their
|
||||
documentation.
|
||||
|
||||
\image qmacstyle.png
|
||||
\sa QWindowsVistaStyle, QWindowsStyle, QFusionStyle
|
||||
*/
|
||||
|
||||
|
||||
/*!
|
||||
\enum QStyleHelper::WidgetSizePolicy
|
||||
|
||||
\value SizeSmall
|
||||
\value SizeLarge
|
||||
\value SizeMini
|
||||
\value SizeDefault
|
||||
*/
|
||||
|
||||
/*! \fn QMacStyle::QMacStyle()
|
||||
Constructs a QMacStyle object.
|
||||
*/
|
||||
|
||||
/*! \fn QMacStyle::~QMacStyle()
|
||||
Destructs a QMacStyle object.
|
||||
*/
|
||||
|
||||
/*! \fn void QMacStyle::polish(QPalette &pal)
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn void QMacStyle::polish(QApplication *)
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn void QMacStyle::unpolish(QApplication *)
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn void QMacStyle::polish(QWidget* w)
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn void QMacStyle::unpolish(QWidget* w)
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn int QMacStyle::pixelMetric(QStyle::PixelMetric metric, const QStyleOption *opt, const QWidget *widget) const
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn QPalette QMacStyle::standardPalette() const
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn int QMacStyle::styleHint(QStyle::StyleHint sh, const QStyleOption *opt, const QWidget *w, QStyleHintReturn *hret) const
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn QPixmap QMacStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn QPixmap QMacStyle::standardPixmap(QStyle::StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget) const
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn void QStyleHelper::setWidgetSizePolicy(const QWidget *widget, QStyleHelper::WidgetSizePolicy policy)
|
||||
|
||||
\obsolete
|
||||
|
||||
Call QWidget::setAttribute() with Qt::WA_MacMiniSize, Qt::WA_MacSmallSize,
|
||||
or Qt::WA_MacNormalSize instead.
|
||||
*/
|
||||
|
||||
/*! \fn QStyleHelper::WidgetSizePolicy QStyleHelper::widgetSizePolicy(const QWidget *widget, const QStyleOption *opt)
|
||||
\obsolete
|
||||
|
||||
Call QWidget::testAttribute() with Qt::WA_MacMiniSize, Qt::WA_MacSmallSize,
|
||||
or Qt::WA_MacNormalSize instead.
|
||||
*/
|
||||
|
||||
/*! \fn void QMacStyle::drawPrimitive(QStyle::PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const
|
||||
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn void QMacStyle::drawControl(QStyle::ControlElement ce, const QStyleOption *opt, QPainter *p, const QWidget *w) const
|
||||
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn QRect QMacStyle::subElementRect(QStyle::SubElement sr, const QStyleOption *opt, const QWidget *widget) const
|
||||
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn void QMacStyle::drawComplexControl(QStyle::ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn QStyle::SubControl QMacStyle::hitTestComplexControl(QStyle::ComplexControl cc, const QStyleOptionComplex *opt, const QPoint &pt, const QWidget *widget) const
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn QRect QMacStyle::subControlRect(QStyle::ComplexControl cc, const QStyleOptionComplex *opt, QStyle::SubControl sc, const QWidget *widget) const
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn QSize QMacStyle::sizeFromContents(QStyle::ContentsType ct, const QStyleOption *opt, const QSize &csz, const QWidget *widget) const
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn void QMacStyle::drawItemText(QPainter *p, const QRect &r, int flags, const QPalette &pal, bool enabled, const QString &text, QPalette::ColorRole textRole) const
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn bool QMacStyle::event(QEvent *e)
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn QIcon QMacStyle::standardIcon(QStyle::StandardPixmap standardIcon, const QStyleOption *opt, const QWidget *widget) const
|
||||
\reimp
|
||||
*/
|
||||
|
||||
/*! \fn int QMacStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget) const
|
||||
\reimp
|
||||
*/
|
||||
|
||||
|
|
@ -41,9 +41,6 @@
|
|||
#ifndef QMACSTYLE_MAC_P_P_H
|
||||
#define QMACSTYLE_MAC_P_P_H
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
#undef check
|
||||
|
||||
#include <QtWidgets/private/qtwidgetsglobal_p.h>
|
||||
#include <QtWidgets/private/qcommonstyle_p.h>
|
||||
#include "qmacstyle_mac_p.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue