summaryrefslogtreecommitdiffstats
path: root/src/plugins/styles/mac
Commit message (Collapse)AuthorAgeFilesLines
* Add an option to scroll the QComboBox on macOS with the mouse wheelAndy Shaw2018-01-051-0/+3
| | | | | | | | | | | | | | | | | | Since there may be some applications that want to make their comboboxes scrollable or not with the mouse wheel then a style hint is added to make this toggable. It defaults to true for all platforms except macOS to keep it in line with existing behavior. [ChangeLog][QtWidgets][QStyle] Added SH_ComboBox_AllowWheelScrolling as a style hint to enable/disable the use of the mouse wheel in a QComboBox. This defaults to true in all styles except the macOS one so there is no change in existing behavior. Task-number: QTBUG-53094 Change-Id: I6eb61e1990bfc79e3b3ea82d7b91ee39096fa077 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLars Knoll2018-01-021-23/+39
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf sc/corelib/io/qfsfileengine_p.h src/corelib/io/qstorageinfo_unix.cpp src/platformsupport/eglconvenience/qeglpbuffer_p.h src/platformsupport/input/libinput/qlibinputkeyboard.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/ios/qiosscreen.h src/plugins/platforms/ios/qioswindow.h src/plugins/platforms/ios/quiview.mm src/printsupport/dialogs/qpagesetupdialog_unix_p.h src/printsupport/dialogs/qprintpreviewdialog.cpp src/printsupport/widgets/qcupsjobwidget_p.h src/widgets/widgets/qmenu.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c
| * QMacStyle: Minimize size of scrollbar transparency layerGabriel de Dietrich2017-12-211-1/+1
| | | | | | | | | | | | | | | | | | Instead of allocating the full backing store size for the transparency layer, we make sure we only allocate exactly as much as needed by the scrollbar. Change-Id: I55c3172fe3dd2a1f3fd46828463497f9f35cb1ae Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * QMacStyle: Use light color on expanding scrollbarGabriel de Dietrich2017-12-211-3/+4
| | | | | | | | | | Change-Id: I4e9c870c8acaaa690f530f847c9927d61a508a94 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * QMacStyle: Bring back submenu indicatorGabriel de Dietrich2017-12-211-19/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This one fell off the truck while we were removing HITheme calls. We add it back by simply rendering a BLACK RIGHT-POINTING TRIANGLE character. We also fix smaller issues, such as not displaying any shortcut related to a submenu action — this is simply not a thing. The spacing between the menu item's text and the submenu indicator has also been slightly improved. Change-Id: I6c768a5506a5eb9528b0dd76acd52b561266d67b Task-number: QTBUG-64405 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Update usage of QFontMetrics::width() to new APIEskil Abrahamsen Blomfeldt2017-12-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QFontMetrics(F)::width() has been deprecated and is replaced by horizontalAdvance(). This updates all usage of it in tests and documentation. It is worth noting that many or most of the usages of QFontMetrics::width() probably intended to use boundingRect().width(), but since it currently works, I have not looked into that, just replaced the function name mechanically. Change-Id: Iec382e5bad0b50f37a6cfff841bfb46ed4d4555f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | doc: Add class qualifiers to parameter typesMartin Smith2017-12-061-14/+14
| | | | | | | | | | | | | | | | This change supplies several missing class qualifiers for parameter types and function return types. Change-Id: I569026e4da0948902fcc13557003d3748b85dd82 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | macOS: Fix handling of multiple ampersands in menu itemsAndre de la Rocha2017-11-301-2/+1
|/ | | | | | | | | | | | | If the text of a QAction in a menu item contained a sequence of multiple ampersand characters, only one of them would be removed, which is inconsistent with the way this situation is handled on Windows, where every other ampersand is removed, which is also the way other widgets such as tabs, buttons, etc. are handled on macOS and other platforms. Task-number: QTBUG-63361 Change-Id: Ibd9a520afa37b3387f3b951a94a3c275742e7ad3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* QMacStyle: De-HITheme item views headers and a couple arrowsGabriel de Dietrich2017-11-152-135/+57
| | | | | | | | | | | | | | | | This one is all manual. The arrows were manual before and the header sections are now plain rectangles. Removes one usage of HIThemeDrawButton and related logic together with a cached pixmap and its rendering. Still broken in some places, but not worse than before. In particular, sunken or selected header sections will not render the left hand side section separator properly. Look can be improved in the header label with different shades for the selected or current rows/columns. Change-Id: I6b1c1f529909341bbf72e82e5a3fc61905c75fa8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* QMacStyle: Render tool button even when a11y is missingGabriel de Dietrich2017-11-151-6/+6
| | | | | | | | | | Tool buttons were being skipped a couple cases (CE_ToolButtonLabel and CC_ToolButton) when accessibility was disabled. Although unlikely anyone would disable accessibility on macOS, we fall back to the non- toolbar rendering if that were to be the case. Change-Id: Ie8ee11475efbe4b418c34842317bafeba80c3c57 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* QMacStyle: Make backingStoreNSView mutableGabriel de Dietrich2017-11-152-6/+6
| | | | | | | | Even thought the resolve function is effectively not const, it's more straightforward to call. Change-Id: I7c881183862c3c0b326daf001b2f9e569153ee76 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* QMacStyle: Replace HITheme info structs with QMSP::CocoaControlGabriel de Dietrich2017-11-152-78/+92
| | | | | | | | This is not yet a full replacement, but a scaffolding stage until we can remove all traces of HITheme info structs. Change-Id: I10eb6a60662c6b102bc687e335d0d1bedd6a4a12 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* QMacStyle: Remove unused codeGabriel de Dietrich2017-11-153-74/+0
| | | | | Change-Id: I6e71871b19ce12daddd4cfbbe7c1d9beede13a9b Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* QMacStyle: Rename Cocoa controls enum namesGabriel de Dietrich2017-11-152-88/+99
| | | | | | | | | For easier sorting and grouping by actual Cocoa NSControl class. We also shorten the names and move the types inside QMacStylePrivate. Change-Id: Iac093fd359da66abd263aca841b870ea84337f50 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* QMacStyle: smooth QMenu corners for realOleg Yadrov2017-10-051-51/+41
| | | | | | | | | | | | | | | | | | | It's been for years that QMenu's rounded corners in qmacstyle_mac were done via QWidget::setMask(QRegion). Unfortunately, QRegion mask does not work well with retina displays and also does not support translucency. That's why in this change we explicitly make QMenu's background transparent and then draw a rectangle with rounded corners in QMacStyle::drawPrimitive(PE_PanelMenu). This not only gives much better result than the mask-based approach, but also de-HIThemes QMenu. As a consequence, QComboBoxPrivateContainer doesn't get any mask from QMacStyle anymore. Therefore, when the mask is empty, we need to paint PE_PanelMenu before invoking QFrame's paint event handler. Made-with: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Change-Id: Ia9236176113f23b86e45507fa6ddf77236084ce3 Reviewed-by: Oleg Yadrov <oleg.yadrov@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* QMacStyle: Remove HITheme calls for QSizeGripGabriel de Dietrich2017-10-031-45/+32
| | | | | | | | | | | | That's no longer a thing on macOS. We still keep it around for QMdiSubWindow, but we should support 4-edge resizing there as do native windows. In practice, because of WA_MacOpaqueSizeGrip, we were already rendering the size grip manually instead of relying on HITheme. Change-Id: If613a14f03dc650b457688f3f2f57631b5fb30a3 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMacStyle: De-HITheme QGroupBoxGabriel de Dietrich2017-10-032-12/+18
| | | | | | | | NSBox is good enough for this and pixel equivalent with the previous HITheme calls. Change-Id: I32b2a1cc8a9cd2a6ef17d1e01032540344808ebc Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMacStyle: Refactor QMacStylePrivate::cocoaControl()Gabriel de Dietrich2017-10-032-55/+55
| | | | | | | | | | That switch following the if looked a bit corny. Also made cocoaCells hash mutable to get rid of the const_cast(this) in QMSP::cocoaCell(). Change-Id: I4facec827409314cf1214152c19efb9688715eb2 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-09-202-14/+30
| | | | | | | | | | Conflicts: src/plugins/styles/mac/qmacstyle_mac.mm src/widgets/util/qcompleter.cpp src/widgets/widgets/qmainwindowlayout.cpp src/widgets/widgets/qmdisubwindow.cpp Change-Id: If0e96981af07ce36ac68f2e69211bc2120f93973
* Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into ↵Liang Qi2017-09-062-1/+5
|\ | | | | | | refs/staging/5.10
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-09-062-1/+5
| | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/qopenglwidget/main.cpp src/3rdparty/pcre2/src/pcre2_printint.c src/plugins/platforms/cocoa/qnsview.mm src/widgets/widgets/qcombobox.cpp Change-Id: I37ced9da1e8056f95851568bcc52cd5dc34f56af
* | QMacStyle: Remove theme test in palette polishGabriel de Dietrich2017-09-061-8/+1
| | | | | | | | | | | | | | | | | | | | macOS doesn't use different colors for alternate rows between blue and graphite themes. It's always the same light gray, as seen on Finder, and we're already getting it right. Change-Id: Ic9ff1712ed90728bcc7613d9fe9eeb7a9c90f59b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | QMacStyle: No more background pattern pixmapGabriel de Dietrich2017-09-062-64/+0
| | | | | | | | | | | | | | This ain't used nowhere. Change-Id: I107bbc4d8cd223bbc726c3ce2ea00059d97e6f2c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | QMacStyle: Update HIG link, reference version of IBGabriel de Dietrich2017-09-061-3/+3
| | | | | | | | | | Change-Id: Iae56312a78431613737b69c0e16472cafff35da9 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | QMacStyle: Render only the selected scrollbar subcontrolsGabriel de Dietrich2017-09-061-40/+49
| | | | | | | | | | | | | | | | This provides proper support for proxy styles wanting to override only parts of QSlider. Change-Id: Ica1e87c42c8d793708c388cb19f11105c0fc97ad Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | QMacStyle: De-HITheme QSliderGabriel de Dietrich2017-09-061-228/+205
| | | | | | | | | | | | | | | | | | | | This one uses a hybrid approach. Standalone NSSliderCell has proven to be quite useless. However, we can access the cell of a properly configured NSSlider. Then, the cell can be to render all the QSlider parts as well as getting their rects. Change-Id: Idedad3e6d80e70631b01125596ed24dae5fde6c7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | QMacStyle: No more SInt32Gabriel de Dietrich2017-09-061-7/+7
|/ | | | | Change-Id: I00805bf55566059f842203faaad13a6d4a5b96f4 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-311-1/+6
| | | | | | | | | | | | | | | | | | | | Conflicts: examples/examples.pro qmake/library/qmakebuiltins.cpp src/corelib/global/qglobal.cpp Re-apply b525ec2 to qrandom.cpp(code movement in 030782e) src/corelib/global/qnamespace.qdoc src/corelib/global/qrandom.cpp src/gui/kernel/qwindow.cpp Re-apply a3d59c7 to QWindowPrivate::setVisible() (code movement in d7a9e08) src/network/ssl/qsslkey_openssl.cpp src/plugins/platforms/android/androidjniinput.cpp src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/widgets/widgets/qmenu.cpp tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp Change-Id: If7ab427804408877a93cbe02079fca58e568bfd3
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-152-7/+23
| | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoamenu.h src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/widgets/styles/qstylehelper_p.h Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
* Merge remote-tracking branch 'origin/5.9' into devOswald Buddenhagen2017-08-022-35/+47
| | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp src/plugins/styles/mac/qmacstyle_mac.mm src/widgets/widgets/qdockarealayout.cpp src/widgets/widgets/qmainwindow.cpp src/widgets/widgets/qmainwindowlayout.cpp src/widgets/widgets/qmainwindowlayout_p.h tests/auto/corelib/tools/qlocale/tst_qlocale.cpp tests/auto/other/macnativeevents/BLACKLIST tests/auto/widgets/widgets/qmenu/BLACKLIST Change-Id: Ic8e724b80a65e7b1af25511b0e674d209265e567
* Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-07-192-2/+6
| | | | | | | | Conflicts: src/corelib/io/qwindowspipewriter.cpp src/widgets/styles/qcommonstyle.cpp Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6
* macOS: Fix exception when drawing scrollbars with zero-rangeTor Arne Vestbø2017-07-141-1/+2
| | | | | | | | | | | | | | | | | | | | Terminating app due to uncaught exception 'CALayerInvalidGeometry', reason: 'CALayer position contains NaN: [nan nan]' 0 CoreFoundation __exceptionPreprocess 1 libobjc.A.dylib objc_exception_throw 2 CoreFoundation +[NSException raise:format:] 3 QuartzCore _ZN2CA5Layer12set_positionERKNS_4Vec2IdEEb 4 QuartzCore -[CALayer setPosition:] 5 QuartzCore -[CALayer setFrame:] 6 AppKit -[NSScrollerImp _updateLayerGeometry] 7 AppKit -[NSScroller setFloatValue:knobProportion:] 8 libqmacstyle setupScroller(NSScroller*, QStyleOptionSlider const*) 9 libqmacstyle QMacStyle::drawComplexControl(...) Change-Id: I5afe7e7d3e94ff1d9ee34f5a9bc0d229d4f7c4c6 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devGabriel de Dietrich2017-07-132-12/+65
| | | | | | | Conflicts: src/widgets/widgets/qmainwindowlayout.cpp Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
* QMacStyle: Simplify logic for SC_GroupBoxLabel rectangleGabriel de Dietrich2017-07-102-29/+18
| | | | | | | | | | | This removes the single occurrence of HIThemeGetTextDimensions. Since we have access to the actual platform font through QPlatformTheme::font(), it's possible to use QFontMetricsF instead. We also cache small and mini system fonts to be reused in other places. Change-Id: I799c61eef0a2a6880a1c51aa7d3105c7e5b0ed4f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* QMacStyle: Simplify rendering SC_GroupBoxLabelGabriel de Dietrich2017-07-101-27/+12
| | | | | | | Removes the last occurrence of HITHemeDrawTextBox. Change-Id: I13804a16672c692a4405d8b2f9d5fb6a132a6b7b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* QMacStyle: Simplify CE_PushButtonLabel, CE_TabBarTabLabelGabriel de Dietrich2017-07-101-138/+54
| | | | | | | | | | We don't need the calls to HIThemeDrawTextBox after all. These render simple text nowadays, so we can do this with Qt APIs. Also fixes TabBarPalette in QCocoaTheme. Change-Id: Ib9436be83f03bd62fca40feb110a86602794c5b7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* QMacStyle: De-Carbonize QScrollBarGabriel de Dietrich2017-07-071-472/+385
| | | | | | | | | | | | | | | | | | | | Addresses drawing, hit testing, subcontrol rects and one metric. Also fixes the knob width on hovered transient scrollbars. Since Cocoa won't help for this (and never will), we do it manually. For non-transient scrollbars, no more HITheme. That's why we're doing this after all. It also comes with its own small hack; see how we darken the knob when hovered. We had to de-intertwine the logic with QSlider in drawComplexControl(), which now gets its own full case CC_Slider statements. QSlider will be addressed next. Task-number: QTBUG-49585 Change-Id: Iced58d52fff0c11866bdf6eb562dbab36c8f3ef2 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-042-2/+9
| | | | | | | | | | | | Conflicts: src/corelib/io/qprocess_unix.cpp src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/util/util.pri tests/auto/corelib/thread/qthread/qthread.pro tests/auto/corelib/thread/qthread/tst_qthread.cpp Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b
* QStyleAnimation: Go down to 15 fpsGabriel de Dietrich2017-06-011-2/+2
| | | | | | | | | | | | | | | | | The new implementation of CE_ProgressBarContents in QMacStyle uses NSProgressIndicator, which is noticeably heavier than the previously used HITheme API. Setting the animation frame rate to 20 fps improves things significantly compared to the default 30 fps, but Cocoa seems to update the animation at 15 fps for indeterminate NSProgressIndicator. Going down to 12 or 10 fps may be an option in the future, but it's not compatible with NSProgressIndicator. Change-Id: Ie1e18d7d78d1bd7ea38a12d715a6a7db0e175a29 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QMacStyle: Remove HITheme APIs to render QProgresssBarGabriel de Dietrich2017-06-012-50/+147
| | | | | | | | | | We use NSProgressIndicator in a similar fashion as we do with NSScroller for transient scrollers. Also changed the signature of QCocoaDrawRectBlock. Change-Id: I0fef8e327494fb557af2c2bab2aafa57c2e69564 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* QMacStyle: Remove unused default button logicGabriel de Dietrich2017-05-162-47/+6
| | | | | | | | The auto-default button part must remain, but the pulsating animation logic can go. Same for the pressed button logic. Change-Id: I0e9a755f86601780a219296fbc02a1eb2b703aea Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMacStyle: Move disclosure triangle into cocoaCell() logicGabriel de Dietrich2017-05-152-11/+11
| | | | | Change-Id: Ica7766dabba57af3107ea275aa48514bc65158fb Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMacStyle: Use NSStepperCell for QSpinBox buttonsGabriel de Dietrich2017-05-152-65/+71
| | | | | | | Includes painting and subcontrol rectangles. Change-Id: I9a4c704bdea4f20f8dca94de24063f3e14dbaf91 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMacStyle: Remove a couple void *, dead codeGabriel de Dietrich2017-05-152-20/+13
| | | | | Change-Id: If05fbdf8cc5ced81adfd75232313969223bf1453 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMacStyle: Move NSScrollers into cocoaControl() logicGabriel de Dietrich2017-05-152-15/+11
| | | | | | | This patch amends b1131074199aae97. Change-Id: Ib305554763457ae4b5a441e41947304cff2853a2 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMacStyle: Refactor NSGraphicsContext setup logicGabriel de Dietrich2017-05-152-24/+30
| | | | | Change-Id: I00d473454bf970ef55f44d6094039b3f02221155 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMacStyle: Remove brushed metal related codeGabriel de Dietrich2017-05-151-70/+17
| | | | | Change-Id: I000d70c7bcc839c04a89cb87052187eeec62243f Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMacStyle: Replace QAquaWidgetSize with WidgetSizePolicyGabriel de Dietrich2017-05-152-218/+206
| | | | | | | | | No need to have two enums for the exact same purpose. qmacstyle auto-test updated as well. Change-Id: Ia601648191e39c0cbbaa7477143441005ae063c2 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMacStyle: Replace HIRect, HIPoint with CGRect, CGPointGabriel de Dietrich2017-05-152-116/+101
| | | | | | | | | We probably changed how rounding is done between CGRect and QRect coordinates, but we expect more things to change in the near future. Change-Id: If961849c46edc5fcfee9aef2acda57f386b2928b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMacStyle: Remove HITheme for CE_MenuItem, etc.Gabriel de Dietrich2017-05-151-122/+69
| | | | | | | Includes the unlikely non-native menu bar. Change-Id: Ibc36cbdbe5add3798fe65066d87c48e84804ec33 Reviewed-by: Jake Petroules <jake.petroules@qt.io>