summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qmacstyle_mac.mm
Commit message (Collapse)AuthorAgeFilesLines
* Fix bug QTBUG-13901, Mac style button rectChris Meyer2011-08-121-1/+1
| | | | | Make sure that clicks in the corners of buttons with Mac style are treated properly. Added test case.
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-07-121-5/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix compiler warning in qtextdocument.cpp Fix crash when app font is added Use truncate only for subpixel boundingBox x position Use more numerically robust algorithm to compute QBezier::pointAt(). Fix editable combobox style on Mac Revert 344a4dcfe and part of 93bce787 Fix raster subpixel positioning in Lion
| * Fix editable combobox style on MacJiang Jiang2011-07-071-5/+5
| | | | | | | | Reviewed-by: Jens Bache-Wiig
* | Lion Support: Fix QSpinBox lookGabriel de Dietrich2011-07-051-1/+1
| | | | | | | | | | | | Also sets the read-only state in QStyleOptionSpinBox, wich wasn't before. Reviewed-by: Jens Bache-Wiig
* | Lion Support: Hand made rendering of selected tab textGabriel de Dietrich2011-07-041-2/+20
|/ | | | Reviewed-by: Jens Bache-Wiig
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Don't use inactive borders for spinbox on MacJens Bache-Wiig2011-03-281-1/+1
| | | | | | | | | This was probably caused by the fact that the only spinbox visible in the main control panel has an inactive frame border. In XCode 4, however the spin buttons are generally attached to an active lineedit frame, so we change the default for 4.8. Reviewed-by: gabriel
* Merge earth-team into masterOlivier Goffart2011-03-151-1/+1
|\
| * Mac Style: Compile FixMartin Petersson2011-03-141-1/+1
| | | | | | | | | | Task-number: QTBUG-13055 Reviewed-by: Markus Goetz
| * Fix corner of scroll area so it is stylable on Mac.Martin Petersson2011-03-101-1/+1
| | | | | | | | | | Task-number: QTBUG-13055 Reviewed-by: Olivier Goffart
* | Merge request: 1111Richard Moe Gustavsen2011-02-251-0/+7
|/ | | | Rev-By: jbache
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Fix a namespace error and some warnings found by clangJiang Jiang2010-11-231-6/+4
| | | | | | | | Reviewed-by: Fabien Freling
* | QTBUG-4201 fixedakorenevsky2010-11-191-3/+2
| | | | | | | | | | Merge-request: 660 Reviewed-by: Fabien Freling <fabien.freling@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-071-4/+6
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| * Ensure that the underline is only drawn when expected for an accelAndy Shaw2010-10-041-4/+6
| | | | | | | | | | | | | | | | | | | | | | On Mac, the underline for an accel should not be drawn at all as this is not part of the style guidelines. This ensures that it is not drawn. Autotest included which required a change to drawItemText() to go via the proxy as well so that the autotest would be useful too. Task-number: QTBUG-14172 Reviewed-by: Richard
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-0/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * Mac: Fix crash when using style to draw on other things than widgetsRichard Moe Gustavsen2010-08-101-0/+3
| | | | | | | | | | | | | | | | When drawing a complex control using the style, you are allowd to skip giving a widget as the last argument. But when doing so, it caused a crash in the mac style. Reviewed-by: Fabien Freling
| * Mac: fix regression from 65a673f that makes some buttons unclickableRichard Moe Gustavsen2010-08-041-0/+10
| | | | | | | | | | | | | | | | | | If a button has a small gemoetry, the mac style will reender it as flat. Change 65a673f did not take this logic into account when massaging the hit rect of the button. This patch will. Task-number: QTBUG-10401 Reviewed-by: cduclos
* | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(this,* */f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(&\([^\(),]*\),* */\\2.f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*()\),* */\\2->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\):\([^\(),]*\),* */(\\2:\\3)->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\),* */\\2->f\\1(/'" qFindChild Rev-by: dev mailing list
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: bin/syncqt src/gui/text/qtextlayout.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/configure/configureapp.cpp
| * Fix for a leak in the mac style.Denis Dzyubenko2010-06-211-1/+1
| | | | | | | | | | Task-number: QTBUG-11550 Reviewed-by: Morten Sørvig
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-06-011-151/+59
|\ \ | |/
| * Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-241-1/+1
| |\ | | | | | | | | | | | | Conflicts: src/gui/styles/qmacstyle_mac.mm
| * | Removing unneeded qDebug statement.Carlos Manuel Duclos Vergara2010-05-211-1/+0
| | | | | | | | | | | | Reviewed-by: Richard Moe Gustavsen
| * | Fixing incorrect addition of public API symbols.Carlos Manuel Duclos Vergara2010-05-211-146/+35
| | | | | | | | | | | | | | | | | | | | | | | | This commit is related to 49a6f4a7d87def3816cebf0115ddadf43e9c4d01 and contains all the files that were modified. The previous commit contained only the newly added file. Reviewed-by: jbache
| * | Improve look and feel of itemviews on macJens Bache-Wiig2010-05-201-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These fixes are neccessary and requested by Qt Creator and should go into 4.7.0. The fixes involved is: - positioning of disclosure arrow in treeviews - spacing between icon and text label - added 2 pixel spacing between item view items Note that native cocoa views tend to use 3 pixel spacing. We considered this and decided on leaving it at 2 which is what you see in finder list views, XCode among other places. It also makes the change a bit less radical. Reviewed-by:cduclos Task-number:QTBUG-10190
| * | QPushButton's click area exceeds the button area by far on Mac OS XCarlos Manuel Duclos Vergara2010-05-201-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is the "rounding" of buttons in OSX. To achieve this we add some padding to the buttons, therefore creating an inner rect for the widget. The common hitButton(...) method found in QAbstractButton just checks the normal rect of the widget. What this patch does is to reimplement hitButton(...) in QPushButton, but only for the Mac case. In this reimplemented method I calculate the inner rect and check if the hit point is inside that rect or not. Task-number: QTBUG-10401 Reviewed-by: Richard Moe Gustavsen
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-251-1/+1
|\ \ \ | | |/ | |/|
| * | Compile with gcc 4.0.1Olivier Goffart2010-05-201-1/+1
| |/ | | | | | | | | | | | | | | | | | | qstylehelper_p.h now includes qstringbuilder.h This triggers a gcc 4.0.1 bug when doing addition or % on annonymous enum - include qstylehelper_p.h last to avoid errors in 3rd party header - explicitly cast enums to int in qwindowsstyle.cpp Reviewed-by: Thierry
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-191-9/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf
| * Fix off-by-one in text layouts and widget size hints on MacEskil Abrahamsen Blomfeldt2010-05-101-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mac font engine was made to return fractional values. This has exposed a few bugs where the rounded height of the font was used for text layouts and widget size hints. Since a fractional part of the font's height also creates pixels, rounding the height down in these cases is always wrong. The biggest culprit was QScriptLine::height. This is used to lay out text lines and returning a fractional height created problems all over the place. Rather than ceil the number in all places where it is used, we simply return a ceiled value for the line's height. In 4.6, this value would be qRound(ascent)+qRound(descent)+1, which would in some cases cause the previous and current line to overlap by one pixel. By ceiling the sum of the two, we guarantee that the text line contains the complete bounds of the font. A note about the removal of the code that gets the font metrics for QSmallFont: The condition would never be true since this is inside a branch which is only evaluated if fontIsSet is true. Task-number: QTBUG-9971 Reviewed-by: Gunnar
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-04-271-5/+11
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt.qdocconf
| * Improve itemview appearance on MacJens Bache-Wiig2010-04-201-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | This fixes two significant issues with the mac look and feel. * Remove superfluous white inner border from item views. This makes items fill all the way to the border. * Remove double border for item view headers. We now clip headers properly to make them blend with the outer border. Reviewed-by: Morten Sørvig Task-number: QTBUG-10047
* | Merge branch 'master' of git:qt/oslo-staging-2Thiago Macieira2010-04-221-0/+51
|\ \ | |/ |/| | | | | Conflicts: src/gui/painting/qtextureglyphcache.cpp
| * Made sure that QTabWidget reported a big enough size hint.Jan-Arve Sæther2010-04-211-0/+51
| | | | | | | | | | | | This avoids some minor clipping issues observed (see autotest). Reviewed-by: MortenS
* | Fix the bug where the ampersand symbol would be discarded.Fabien Freling2010-03-261-2/+2
| | | | | | | | | | | | | | | | We are now checking that the QAction is not related to the About or Quit button on Mac OS X Task-number: QTBUG-7540 Reviewed-by: Morten Sorvig
* | Tab color fix for document mode on Snow Leopard.Robert Griebl2010-03-191-4/+6
|/ | | | | | | The window frame/toolbar color is different (a bit lighter) for snow leopard, so we need to adjust the tab color in document mode . Reviewed-by: Richard Moe Gustavsen
* Fixed cosmetic glitch in QTabBar label's renderingGabriel de Dietrich2010-02-231-1/+1
| | | | | | This seems to have appeared after commit 3baf7b981a8f40ed. Reviewed-by: Olivier
* Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-2/+8
|\ | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * Another fix for the non unified title+toolbar regarding text under iconsAndy Shaw2010-02-041-2/+8
| | | | | | | | | | | | | | | | This makes the case where there is text under the icons in toolbuttons and the title and toolbar is not unified on Mac. This was a regression against Qt 4.5.x Reviewed-by: jbache
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-041-6/+15
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * Fixed potential crash in mac styleJens Bache-Wiig2010-02-021-3/+5
| |
| * Fix missing non-unified toolbar margins on MacJens Bache-Wiig2010-02-021-6/+13
| | | | | | | | | | | | | | | | | | The tool bar appearance have regressed in 4.6 for applications that do not utilize the unified tool bar appearance. This fix restores the margin and spacing to their 4.5 appearance. Task-number: QTBUG-7831 Reviewed-by: morten
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-72/+104
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Fix header labels on mac with rtlJens Bache-Wiig2010-01-281-2/+0
| | | | | | | | | | | | | | | | | | The removed code simply reduces the size of the rect when running with RightToLeft without compensating anywhere else. It seems to be a leftover from a previously removed piece of code. Reviewed-by: richard Task-number: QTBUG-6882
| * Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash.Carlos Manuel Duclos Vergara2010-01-261-72/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | The problem here is the fact that we "trusted" the user when the widget type was specified. The fix consists in checking the result of the conversions, if the conversion was successful (i.e. the widget was of the type specified by the user) then we proceed as usual. If the conversion was not successful (i.e. wrong widget type) then we ask the style for a sensible size. I modified this for QPushButton, QSlider and QToolButton. Task-number: qtbug-7522 Reviewed-by: jbache
* | Fix header labels on mac with rtlJens Bache-Wiig2010-01-281-2/+0
| | | | | | | | | | | | | | | | | | The removed code simply reduces the size of the rect when running with RightToLeft without compensating anywhere else. It seems to be a leftover from a previously removed piece of code. Reviewed-by: richard Task-number: QTBUG-6882
* | Merge branch 'master' into staging-1-masterPaul Olav Tvete2010-01-251-5/+19
|\ \ | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc
generated by cgit v0.12 at 2024-12-04 03:58:11 (GMT)