FCL/sf/mw/qt: comparison src/gui/kernel/qapplication

equal deleted inserted replaced

-:41300fa6a67c
+:2f34d5167611
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 void onApplicationWindowChangedActivation( QWidget*widget, bool activated );
 void onApplicationChangedActivation( bool activated );
 static void qt_mac_read_fontsmoothing_settings()
 {
-NSInteger appleFontSmoothing = [[NSUserDefaults standardUserDefaults] integerForKey:@"AppleFontSmoothing"];
+qt_applefontsmoothing_enabled = true;
-qt_applefontsmoothing_enabled = (appleFontSmoothing > 0);
+int w = 10, h = 10;
+QImage image(w, h, QImage::Format_RGB32);
+image.fill(0xffffffff);
+QPainter p(&image);
+p.drawText(0, h, "X\\");
+p.end();
+const int *bits = (const int *) ((const QImage &) image).bits();
+int bpl = image.bytesPerLine() / 4;
+for (int y=0; y<w; ++y) {
+for (int x=0; x<h; ++x) {
+int r = qRed(bits[x]);
+int g = qGreen(bits[x]);
+int b = qBlue(bits[x]);
+if (r != g || r != b) {
+qt_applefontsmoothing_enabled = true;
+return;
+}
+}
+bits += bpl;
+}
+qt_applefontsmoothing_enabled = false;
 }
 Q_GUI_EXPORT bool qt_mac_execute_apple_script(const char *script, long script_len, AEDesc *ret) {
 OSStatus err;
 AEDesc scriptTextDesc;
 const QRect globalGlWidgetRect = QRect(glWidget->mapToGlobal(QPoint(0, 0)), glWidget->size());
 if (globalWidgetRect.intersects(globalGlWidgetRect)) {
 qt_post_window_change_event(glWidget);
 it->lastUpdateWidget = widget;
 } else if (it->lastUpdateWidget == widget) {
 // Update the gl wigets that the widget intersected the last time around,
 // and that we are not intersecting now. This prevents paint errors when the
 // intersecting widget leaves a gl widget.
 qt_post_window_change_event(glWidget);
 it->lastUpdateWidget = 0;
 }
 }
 #else
 Q_UNUSED(widget);
 #endif
 return;
 // Post a kEventQtRequestWindowChange event. This event is semi-public,
 // don't remove this line!
 qt_event_request_window_change();
 // Post update request on gl widgets unconditionally.
 if (qt_widget_private(widget)->isGLWidget == true) {
 qt_post_window_change_event(widget);
 return;
 }
 }
 }
 if (QApplication::desktopSettingsAware())
 QApplicationPrivate::qt_mac_apply_settings();
-qt_mac_read_fontsmoothing_settings();
 // Cocoa application delegate
 #ifdef QT_MAC_USE_COCOA
 NSApplication *cocoaApp = [NSApplication sharedApplication];
 QMacCocoaAutoReleasePool pool;
 NSObject *oldDelegate = [cocoaApp delegate];
 tablet_proximity_UPP = NewEventHandlerUPP(QApplicationPrivate::tabletProximityCallback);
 qt_init_tablet_proximity_handler();
 }
 priv->native_modal_dialog_active = false;
+qt_mac_read_fontsmoothing_settings();
 }
 void qt_release_apple_event_handler()
 {
 if(app_proc_ae_handlerUPP) {
 // in much smoother scrolling when using Mighty Mouse or TrackPad. For
 // compatibility with older applications, carbon will also send us
 // kEventMouseWheelMoved events if we dont eat this event
 // (actually two events; one for horizontal and one for vertical).
 // As a results of this, and to make sure we dont't receive duplicate events,
 // we try to detect when this happend by checking the 'compatibilityEvent'.
 SInt32 mdelt = 0;
 GetEventParameter(event, kEventParamMouseWheelSmoothHorizontalDelta, typeSInt32, 0,
 sizeof(mdelt), 0, &mdelt);
 wheel_deltaX = mdelt;
 mdelt = 0;
 qt_mac_dblclick.last_button = button;
 qt_mac_dblclick.last_time = GetEventTime(event);
 }
 if (wheel_deltaX || wheel_deltaY) {
+#ifndef QT_NO_WHEELEVENT
 if (wheel_deltaX) {
 QWheelEvent qwe(plocal, p, wheel_deltaX, buttons, modifiers, Qt::Horizontal);
 QApplication::sendSpontaneousEvent(widget, &qwe);
 if (!qwe.isAccepted() && QApplicationPrivate::focus_widget && QApplicationPrivate::focus_widget != widget) {
 QWheelEvent qwe2(QApplicationPrivate::focus_widget->mapFromGlobal(p), p,
 QApplication::sendSpontaneousEvent(QApplicationPrivate::focus_widget, &qwe2);
 if (!qwe2.isAccepted())
 handled_event = false;
 }
 }
+#endif // QT_NO_WHEELEVENT
 } else {
 #ifdef QMAC_SPEAK_TO_ME
 const int speak_keys = Qt::AltModifier | Qt::ShiftModifier;
 		if(etype == QMouseEvent::MouseButtonDblClick && ((modifiers & speak_keys) == speak_keys)) {
 QVariant v = widget->property("displayText");
 if (popup == qt_button_down)
 qt_button_down = 0;
 if (QApplicationPrivate::popupWidgets->isEmpty()) {  // this was the last popup
 delete QApplicationPrivate::popupWidgets;
 QApplicationPrivate::popupWidgets = 0;
 // Special case for Tool windows: since they are activated and deactived together
 // with a normal window they never become the QApplicationPrivate::active_window.
 QWidget *appFocusWidget = QApplication::focusWidget();
 if (appFocusWidget && appFocusWidget->window()->windowType() == Qt::Tool) {
 appFocusWidget->setFocus(Qt::PopupFocusReason);
 {
 // FIXME: get from the system
 return QApplicationPrivate::keyboard_input_time;
 }
+#ifndef QT_NO_WHEELEVENT
 void QApplication::setWheelScrollLines(int n)
 {
 QApplicationPrivate::wheel_scroll_lines = n;
 }
 int QApplication::wheelScrollLines()
 {
 return QApplicationPrivate::wheel_scroll_lines;
 }
+#endif
 void QApplication::setEffectEnabled(Qt::UIEffect effect, bool enable)
 {
 switch (effect) {
 case Qt::UI_FadeMenu:
 num = settings.value(QLatin1String("cursorFlashTime"),
 QApplication::cursorFlashTime()).toInt();
 QApplication::setCursorFlashTime(num);
+#ifndef QT_NO_WHEELEVENT
 num = settings.value(QLatin1String("wheelScrollLines"),
 QApplication::wheelScrollLines()).toInt();
 QApplication::setWheelScrollLines(num);
+#endif
 QString colorspec = settings.value(QLatin1String("colorSpec"),
 QVariant(QLatin1String("default"))).toString();
 if (colorspec == QLatin1String("normal"))
 QApplication::setColorSpec(QApplication::NormalColor);

changeset 18	2f34d5167611
parent 3	41300fa6a67c
child 30	5dc02b23752f