summaryrefslogtreecommitdiff
path: root/src/shared/help
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-10-05 13:52:57 +0200
committerEike Ziller <eike.ziller@qt.io>2019-01-15 14:33:56 +0000
commit3c5650e514d6d8bad86a54a037e550db7cc19a71 (patch)
tree6499046b274c1b6db57cba2505a208be29d35056 /src/shared/help
parent62c8aecb5fd950a56b17483bccd176f4f77245e4 (diff)
downloadqt-creator-3c5650e514d6d8bad86a54a037e550db7cc19a71.tar.gz
Add macOS touch bar support
Introduce a generic Utils::TouchBar that implements a touch bar for macOS based on QAction. Touch bars can be nested, and one is set to be the application's top level touch bar. Also add an ActionContainer for the touch bar. That allows us to manage the layout of the touch bar the same way we do with menus. Since the touch bar is an input device with very limited space, a command in the touch bar needs to be specifically styled for the touch bar by setting either touchBarText or touchBarIcon (or both). Touch bars can be nested by nesting the ActionContainers. A nested touch bar ActionContainer needs to specify an icon and/or text to show in the touch bar button that opens that sub-bar. Commands are only shown in the touch bar if they are valid within the current context. Implementation-wise we cannot use the standard NSPopoverTouchBarItem for nesting touch bar levels. We cannot hide items in the touch bar, because hidden items still take up space in the touch bar. So we need to rebuild the touch bar regularly. Since the items we show are very dynamic, every time the items in the toplevel bar change because of a context change, any opened sub-level touch bar closes. That is why we maintain a stack of touch bar levels ourselves, replacing the main touch bar with the current level, and managing opening and closing the levels manually. This patch adds buttons for Help, Bookmarks, Header/Source, Follow (Symbol), Decl/Def, and a sub-bar for the debugger actions. Fixes: QTCREATORBUG-21263 Change-Id: Ib63e610f21a993f1d324fe23c83a7f2224f434ac Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Diffstat (limited to 'src/shared/help')
-rw-r--r--src/shared/help/helpicons.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/shared/help/helpicons.h b/src/shared/help/helpicons.h
index dd4ebce26a..0dfae1f093 100644
--- a/src/shared/help/helpicons.h
+++ b/src/shared/help/helpicons.h
@@ -36,6 +36,8 @@ const Utils::Icon MODE_HELP_FLAT({
{QLatin1String(":/help/images/mode_help_mask.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon MODE_HELP_FLAT_ACTIVE({
{QLatin1String(":/help/images/mode_help_mask.png"), Utils::Theme::IconsModeHelpActiveColor}});
+const Utils::Icon MACOS_TOUCHBAR_HELP(
+ ":/help/images/macos_touchbar_help.png");
} // namespace Icons
} // namespace Help