summaryrefslogtreecommitdiffstats
path: root/src/widgets/styles/qmacstyle_mac.mm
Commit message (Collapse)AuthorAgeFilesLines
* Mac Style: Fix 1-pixel text offset in combo boxGabriel de Dietrich2013-08-071-0/+2
| | | | | Change-Id: Ie1bb2b300d6897659f4652c22884f1bd611cd3c4 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Display sizegrip on QMdiSubWindows, even on 10.7 and laterGabriel de Dietrich2013-07-121-4/+18
| | | | | | | | | We don't have 4-edge window resizing, so we need QSizeGrip to be functional again in this case. Task-number: QTBUG-32228 Change-Id: Ib66bc662f8bf0b521427755570bc1cd65fb28446 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* QMacStyle: fix auto-default button animationJ-P Nurmi2013-06-261-8/+15
| | | | | | | | | Make sure to stop any previously active (auto-default button) animation when the auto-default button changes. Task-number: QTBUG-31668 Change-Id: Iaa9bfa485b11e49cd7f765d0e54b4e6391ad2f6d Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix QSpinBox clipping issue on Mac when frame=falseJens Bache-Wiig2013-06-191-4/+8
| | | | | | | | | | | | This was a regression from 5.0. Since we still require a minimum height to be present in order for the spin buttons to draw correctly, we require the same height from a spinbox without a frame as one with a frame. task-number: QTBUG-31538 Change-Id: I999f59a29e826e8e621faebffce9cccd9bedb8ca Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* QMacStyle: enable scroll style changes for non-QScrollBarsJ-P Nurmi2013-06-171-3/+15
| | | | | | Task-number: QTBUG-31537 Change-Id: Iee2148609df5cb2c121da4088bcd79f26c2eedc4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mac style: Remove yet another reference to widgetsGabriel de Dietrich2013-05-301-2/+2
| | | | | | Change-Id: I545cfe22c6307864cdb18093a37e09a8ad042347 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix the Mac build on 32bit with c++11Jocelyn Turcotte2013-05-231-8/+8
| | | | | | | | CGFloat is a float on 32bit and qreal is a double. This causes a narrowing error when building with c++11 support. Change-Id: Ia73378ff9798d1f547b37f97393564e2c9e3672d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Don't draw size grip on Mac > 10.6Jens Bache-Wiig2013-05-151-1/+5
| | | | | | | | | | | | | After Apple added the resize functionality to window borders, they stopped rendering the size grip in most apps. Hence we do not need to either. Since the status bar height depends on the status bar being there, we considered the safest option to keep it but make it hidden. Change-Id: Ida06e8f0de0f50d746a7d25bc5a472e22a370645 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* QMacStyle: fix transient scrollbar fade out animationJ-P Nurmi2013-05-091-1/+5
| | | | | | | | | | If a transient scrollbar was hidden during the fade out animation, it got stuck visible after being shown again. A regression introduced by f52177829a20b55624168870498947b28b82d220. Task-number: QTBUG-31060 Change-Id: I1cda16c6afa4370cce4702d3b4fdaee9f44f9ab9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mac style: Fix text offset within 'small' comboboxGabriel de Dietrich2013-04-301-0/+2
| | | | | Change-Id: I2bde1c71e0e79a6d8ef2897acc053357b12dc00c Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Mac style: Update appearance of 'button with menu'Gabriel de Dietrich2013-04-301-19/+69
| | | | | | | | | | Most of the logic was still following the 10.6 UI guidelines, and had not yet been upgraded to the 10.7 new button look. We tried to keep 10.6 compatibility were possible, and improve 'small' and 'mini' Aqua sizes support. Change-Id: I64139f24cccd095e9349b27a987395210b55c586 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Make password mask characters themeable.Mitch Curtis2013-04-191-3/+0
| | | | | | | | Task-number: QTBUG-29871 Change-Id: I3cf739a321d7917f8f8431992e29bba0871b1934 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Mac: Fix warnings about non-existing native Windows on startup.Friedemann Kleint2013-04-181-5/+5
| | | | | | | Shown for example by Qt Designer. Change-Id: Ia866a93a781a027aa3703f44314954888d75d436 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Mac: Fix various memory leaksGabriel de Dietrich2013-04-181-0/+1
| | | | | Change-Id: Id554be11ffcf9a506c217b0dc5b96cb37c4dd57c Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Mac style: Fix disabled menu item palette entryGabriel de Dietrich2013-03-291-1/+1
| | | | | | | Also, removed an "magic color" form the style implementation. Change-Id: Iefd3ddc0d9d651d2b87f20eb1f9990a214b651df Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Support high-dpi pixmaps.Morten Johan Sørvig2013-03-281-10/+13
| | | | | | | | | | | | When Qt::AA_UseHighDPIImages is set images and pixmaps may be of the high-dpi type. Account for this when calculating layout sizes by dividing by devicePixelRatio() to go from device pixels to device-independent pixels. Change-Id: I977a86789f9097ebc3c3704ae76e9706f2cb79d8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mac style: Fix scaled clipping regions on retina displaysGabriel de Dietrich2013-03-281-1/+1
| | | | | | | Task-number: QTBUG-30311 Change-Id: Ic91fc6b2787a035292917c39d26b578dde0a6346 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Make QMacStyle paint right side up again.Morten Johan Sørvig2013-03-281-4/+4
| | | | | | | | | 491dcbfac8 accidentally removed the y-axis inversion for the widget case. Move it back to the common code path. Change-Id: Ie6bbe6f442ca342347af77071da3a743b5655159 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Mac style: Remove suspicious assignmentGabriel de Dietrich2013-03-271-1/+0
| | | | | Change-Id: I070eeb27b1630331afd7f4f02aadf97f6ea2bf97 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Cocoa: Make retina desktop components work.Morten Johan Sørvig2013-03-261-4/+8
| | | | | | | Scale non-widget paint devices as well. Change-Id: Ic68fb166058e9b162f8baeab81196ee254f30b2e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Merge branch 'dev' into stableOswald Buddenhagen2013-03-201-61/+48
|\ | | | | | | | | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Conflicts: src/gui/text/qfontdatabase.cpp src/gui/text/qharfbuzz_copy_p.h src/widgets/kernel/qapplication.cpp src/widgets/kernel/qcoreapplication.cpp Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b
| * Fix license headers stating QtGui for QtWidgets files.Jake Petroules2013-03-191-1/+1
| | | | | | | | | | Change-Id: I0ca49e3e1f9f603f0b0f7f3553e854b871efe303 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Whitespace cleanup: remove trailing whitespaceAxel Waggershauser2013-03-161-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Improved appearance of mac toolbar handlesJens Bache-Wiig2013-03-131-9/+3
| | | | | | | | | | | | | | The old ones were too heavy and cluttered to fit on mac. Change-Id: I5d9f1a8801992026af65af4c6b2aeae3a03a9f5c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Improve the look and feel of Mac extension arrowJens Bache-Wiig2013-03-131-2/+4
| | | | | | | | | | | | | | | | This adds an improved extension arrow as well as a graphic for retina macs. Change-Id: Ie7395bbd87d6d354437bdbcc0cf258a27c09a360 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Draw StatusBar with gradient on macJens Bache-Wiig2013-03-131-12/+0
| | | | | | | | | | | | | | | | We can safely remove code applying to 10.3 on mac. We also should draw the gradient even on non unified toolbars. Change-Id: Ia97c3c93daf7a711c3ce4b61b74a5eb1d914519b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * qtbase: Fix duplicate symbol errors in static build on MacGabriel de Dietrich2013-03-061-24/+30
| | | | | | | | | | | | | | | | | | | | | | There is some code duplication between QMacStyle anf the Cocoa QPA plugin regarding painting and bridging with Cocoa. Task-number: QTBUG-29725 Change-Id: I347407a9bca47b6fccd77fb924688bd35135d96b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-051-1/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/mac/pbuilder_pbx.cpp src/corelib/kernel/qtimerinfo_unix.cpp src/plugins/platforms/cocoa/qcocoabackingstore.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1
| * | | Remove ifdefs for supporting Mac OS <= 10.5Tor Arne Vestbø2013-02-181-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt5 requires Mac OS 10.6, so we can remove checks such as if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 Change-Id: Iea21727a277291148704ecf9677ed0b68c24920f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-141-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
| * | | | Fix sizeHint for QAbstractSpinBoxCaroline Chao2013-02-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current size hint is not correct and the text is truncated when using prefix/suffix. Update QCommonStyle::sizeFromContents() to get the button and frame widths into account for the QSpinBox width. Update sizeFromContents() in the different styles to be consistent with the change in QCommonStyle. Update minimumSizeHint(), calculate it using the prefix and data range. The SpinBox can shrunk over the suffix if any. Task-number: QTBUG-28863 Change-Id: Ia742232edf8b11d0283e8136c2818928f8755103 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * | | | QMacStyle: enable transient scrollbars for the desktop componentsJ-P Nurmi2013-01-311-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4f57a2c4eade779c594abaacaa872540b3b23cb1 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | | | Mac: Fix inactive window appearanceGabriel de Dietrich2013-03-061-21/+14
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The inactive palette values were set to be the same as the disabled palettte whereas, on Mac, they are the same as the active palette. Also, some of the logic to draw inactive looking widgets was a bit dubious. Add to that the fact that HITheme is not responding to kThemeStateInactive as expected, or so it looks. Task-number: QTBUG-29860 Change-Id: I5d67765a9411a40449a8a4440276b2fad167f7c4 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | | Cocoa: Fix appearance of transient light scroll bars.Christoph Schleifenbaum2013-02-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On dark background scroll bars will be rendered light. Since the scroller object is shared across intances, this flag also has to be reset. Otherwise all scrollbars are drawn light. Change-Id: I3800cc783d7fd7ebff296d9db7454efb5b33e7a3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | | QMacStyle::drawControl(CE_ProgressBar): add missing null pointer checkJ-P Nurmi2013-02-201-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | Do not spin off progress bar animations if QStyleOption::styleObject is not set. Task-number: QTBUG-29748 Change-Id: I4e17a4892e82cae48250afa7a270b15ca5730f46 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | Mac: Fix transient scroll bar appearance.Christoph Schleifenbaum2013-02-131-7/+7
| |/ |/| | | | | | | | | | | | | | | | | Transient scroll bars should never be used outside of scroll areas, since they would be unusable. Task-Number: QTBUG-29389 Change-Id: Ie52d2093a4ab66085300a19ca9a1b32f13a29e79 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Added missing null pointer check in QMacStyleJens Bache-Wiig2013-02-051-1/+1
|/ | | | | | | | | QMacStyle::subElementRect could crash if SE_LineEditContents was used without providing a widget pointer. Task-number: QTBUG-27033 Change-Id: I15ef07ae1310be4257a8480d392f98dbf02168d3 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-181-1/+1
| | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Compile in 32-bit mode.Morten Johan Sørvig2013-01-091-2/+2
| | | | | | | CGRect == NSRect only in 64-bit mode. Change-Id: I069b5b050ccf02654a65375c3ab0f58f7d5cc659 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Don't scale 0-region or region without rectsTor Arne Vestbø2013-01-091-0/+3
| | | | | Change-Id: Ieb523dadc5d726e26645b3a90652be95c2707ea8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Mac: New rendering for disclose triangle, get proper color when selectedGabriel de Dietrich2012-12-191-16/+26
| | | | | Change-Id: I2be0a28df3f5dd2fdfae13be6ec98763a04187c1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Mac: disable transient scrollbar animations for non-QScrollBarsJ-P Nurmi2012-12-111-1/+5
| | | | | | | | Task-number: QTBUG-28389 Task-number: QTBUG-28380 Change-Id: I91edd9c8aba60118d722bbf9ad5b85f994398823 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mac: Animated expanding scrollbars on 10.8Gabriel de Dietrich2012-12-061-24/+56
| | | | | Change-Id: Ib57d0347a7828ac7582b0fa95adf8d437694cd41 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Mac: Cleaner transient scrollbar renderingGabriel de Dietrich2012-12-061-14/+7
| | | | | | Change-Id: I617588012aa5166775c3c6301ee70043b22553a3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Basic high-dpi "retina" support for Qt 5.Morten Johan Sørvig2012-12-011-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 5 on par with Qt 4, prepare for more comprehensive support later on. Introduce device independent pixels (dips), device pixels, and devicePixelRatio. Add high-dpi support to QPainter, QGLWidget, the cocoa platform plugin, mac and fusion styles. Dips are similar to CSS pixels, Apple points and Android density-independent pixels. Device pixels are pixels in the backing store/physical pixels on screen. devicePixelRatio is the ratio between them, which is 1.0 on standard displays and 2.0 on "retina" displays. New API: QImage::devicePixelRatio() and setDevicePixelRatio() QPixmap::devicePixelRatio() and setDevicePixelRatio() QWindow::devicePixelRatio() QScreen::devicePixelRatio() QGuiApplicaiton::devicePixelRatio() Change-Id: If98c3ca9bfdf0e1bdbcf7574cd5b912c9ff63856 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Mac: Fix small button metrics, menu indicator alignmentGabriel de Dietrich2012-12-011-2/+6
| | | | | | Task-number: QTBUG-28275 Change-Id: I08de3cc7fee3af725c66ed081072277b2ca32601 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Revise QMacStyle scrollbar animation handlingJ-P Nurmi2012-11-301-65/+51
| | | | | | | | Skip animations whether styleObject is not set. Task-number: QTBUG-27895 Change-Id: I1d2e4655b735627b672bc85f773605adcd375418 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Make Mac style not crash on null styleObject.Morten Johan Sørvig2012-11-291-0/+14
| | | | | | | | | | | | We generally expect styleObject to be set during style draw calls but this isn't always done, especially legacy code outside Qt (for example in Qt creator). Create a temporary stand-in QObject. This will disable scroll bar animations. Change-Id: I781967fe28f68f5952b368cd56be980b9e270ecd Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* QMacStyle: cleanup unused includesJ-P Nurmi2012-11-261-7/+0
| | | | | Change-Id: I8fbc33f86fac5abed4553d35fac2973f47a445e9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 03:24:06 +0000