This ensures WA_MacNormalSize & Co. work (almost) properly.
Task-number: QTCREATORBUG-7966
Change-Id: Ib03b5c0f163409e2bc387f6cf9b56c72c43caec7
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
}
break;
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
case QEvent::MacSizeChange:
updateGeometry();
break;
+#elif defined Q_WS_MAC
case QEvent::ToolTipChange:
case QEvent::MouseTrackingChange:
qt_mac_update_mouseTracking(this);
}
}
+#ifdef Q_OS_MAC
+void QWidgetPrivate::macUpdateSizeAttribute()
+{
+ Q_Q(QWidget);
+ QEvent event(QEvent::MacSizeChange);
+ QApplication::sendEvent(q, &event);
+ for (int i = 0; i < children.size(); ++i) {
+ QWidget *w = qobject_cast<QWidget *>(children.at(i));
+ if (w && (!w->isWindow() || w->testAttribute(Qt::WA_WindowPropagation))
+ && !q->testAttribute(Qt::WA_MacMiniSize) // no attribute set? inherit from parent
+ && !w->testAttribute(Qt::WA_MacSmallSize)
+ && !w->testAttribute(Qt::WA_MacNormalSize))
+ w->d_func()->macUpdateSizeAttribute();
+ }
+ resolveFont();
+}
+#endif
+
/*!
Sets the attribute \a attribute on this widget if \a on is true;
otherwise clears the attribute.
case Qt::WA_MacNormalSize:
case Qt::WA_MacSmallSize:
case Qt::WA_MacMiniSize:
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
{
// We can only have one of these set at a time
const Qt::WidgetAttribute MacSizes[] = { Qt::WA_MacNormalSize, Qt::WA_MacSmallSize,
void grabMouseWhileInWindow();
void registerTouchWindow();
void winSetupGestures();
-#elif defined(Q_WS_MAC) // <--------------------------------------------------------- MAC
+#elif defined(Q_OS_MAC) // <--------------------------------------------------------- MAC
+ void macUpdateSizeAttribute();
+#elif defined(Q_WS_MAC) // <--------------------------------------------------------- MAC (old stuff)
// This is new stuff
uint needWindowChange : 1;
//these are here just for code compat (HIViews)
Qt::HANDLE qd_hd;
- void macUpdateSizeAttribute();
void macUpdateHideOnSuspend();
void macUpdateOpaqueSizeGrip();
void macUpdateIgnoreMouseEvents();
#include "qstyleoption.h"
#include "qapplication.h"
-#ifdef Q_WS_MAC
-# include "private/qt_mac_p.h"
+#ifdef Q_OS_MAC
# include "qmacstyle_mac.h"
#endif
#include <qdebug.h>
extern bool qt_mac_can_clickThrough(const QWidget *w); //qwidget_mac.cpp
if (!(state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget))
state &= ~QStyle::State_Enabled;
-
+#endif
+#ifdef Q_OS_MAC
switch (QMacStyle::widgetSizePolicy(widget)) {
case QMacStyle::SizeSmall:
state |= QStyle::State_Small;
{
Q_D(QCheckBox);
if (e->type() == QEvent::StyleChange
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
|| e->type() == QEvent::MacSizeChange
#endif
)
switch (e->type()) {
case QEvent::StyleChange:
d->updateDelegate();
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
case QEvent::MacSizeChange:
#endif
d->sizeHint = QSize(); // invalidate size hint
d->updateEdit();
break;
case QEvent::StyleChange:
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
case QEvent::MacSizeChange:
#endif
d->setLayoutItemMargins(QStyle::SE_DateTimeEditLayoutItem);
it.key()->setStyle(newStyle);
}
// fallthrough intended
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
case QEvent::MacSizeChange:
#endif
d->resetLayout();
{
Q_D(QFrame);
if (ev->type() == QEvent::StyleChange
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
|| ev->type() == QEvent::MacSizeChange
#endif
)
d->_q_setChildrenEnabled(false);
}
} else if (ev->type() == QEvent::FontChange
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
|| ev->type() == QEvent::MacSizeChange
#endif
|| ev->type() == QEvent::StyleChange) {
if (d->control)
d->textLayoutDirty = true;
} else if (e->type() == QEvent::StyleChange
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
|| e->type() == QEvent::MacSizeChange
#endif
) {
{
Q_D(QProgressBar);
if (e->type() == QEvent::StyleChange
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
|| e->type() == QEvent::MacSizeChange
#endif
)
dialog->d_func()->setMainDefault(this);
}
} else if (e->type() == QEvent::StyleChange
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
|| e->type() == QEvent::MacSizeChange
#endif
) {
{
Q_D(QRadioButton);
if (e->type() == QEvent::StyleChange
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
|| e->type() == QEvent::MacSizeChange
#endif
)
{
Q_D(QSpinBox);
if (event->type() == QEvent::StyleChange
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
|| event->type() == QEvent::MacSizeChange
#endif
)
void QTabWidget::changeEvent(QEvent *ev)
{
if (ev->type() == QEvent::StyleChange
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
|| ev->type() == QEvent::MacSizeChange
#endif
)
if (qobject_cast<QToolBar*>(parentWidget()))
d->autoRaise = true;
} else if (e->type() == QEvent::StyleChange
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
|| e->type() == QEvent::MacSizeChange
#endif
) {