aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/quickcontrols/basic/MenuBar.qml5
-rw-r--r--src/quickcontrols/basic/ToolBar.qml5
-rw-r--r--src/quickcontrols/fluentwinui3/MenuBar.qml8
-rw-r--r--src/quickcontrols/fluentwinui3/ToolBar.qml8
-rw-r--r--src/quickcontrols/fusion/MenuBar.qml5
-rw-r--r--src/quickcontrols/fusion/ToolBar.qml10
-rw-r--r--src/quickcontrols/imagine/ToolBar.qml8
-rw-r--r--src/quickcontrols/ios/MenuBar.qml5
-rw-r--r--src/quickcontrols/ios/ToolBar.qml5
-rw-r--r--src/quickcontrols/macos/MenuBar.qml8
-rw-r--r--src/quickcontrols/material/MenuBar.qml5
-rw-r--r--src/quickcontrols/material/ToolBar.qml5
-rw-r--r--src/quickcontrols/universal/MenuBar.qml5
-rw-r--r--src/quickcontrols/universal/ToolBar.qml5
-rw-r--r--src/quickcontrols/windows/MenuBar.qml8
15 files changed, 72 insertions, 23 deletions
diff --git a/src/quickcontrols/basic/MenuBar.qml b/src/quickcontrols/basic/MenuBar.qml
index 4b72ae9acf..9c74e1165b 100644
--- a/src/quickcontrols/basic/MenuBar.qml
+++ b/src/quickcontrols/basic/MenuBar.qml
@@ -13,6 +13,11 @@ T.MenuBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
+ topPadding: SafeArea.margins.top
+ leftPadding: SafeArea.margins.left
+ rightPadding: SafeArea.margins.right
+ bottomPadding: SafeArea.margins.bottom
+
delegate: MenuBarItem { }
contentItem: Row {
diff --git a/src/quickcontrols/basic/ToolBar.qml b/src/quickcontrols/basic/ToolBar.qml
index dd621356b7..33da781da1 100644
--- a/src/quickcontrols/basic/ToolBar.qml
+++ b/src/quickcontrols/basic/ToolBar.qml
@@ -13,6 +13,11 @@ T.ToolBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
+ topPadding: SafeArea.margins.top
+ leftPadding: SafeArea.margins.left
+ rightPadding: SafeArea.margins.right
+ bottomPadding: SafeArea.margins.bottom
+
background: Rectangle {
implicitHeight: 40
color: control.palette.button
diff --git a/src/quickcontrols/fluentwinui3/MenuBar.qml b/src/quickcontrols/fluentwinui3/MenuBar.qml
index 7487fdb6e2..048d21d5c7 100644
--- a/src/quickcontrols/fluentwinui3/MenuBar.qml
+++ b/src/quickcontrols/fluentwinui3/MenuBar.qml
@@ -15,10 +15,10 @@ T.MenuBar {
spacing: config.spacing || 0
- topPadding: config.topPadding || 0
- bottomPadding: config.bottomPadding || 0
- leftPadding: config.leftPadding || 0
- rightPadding: config.rightPadding || 0
+ topPadding: SafeArea.margins.top + (config.topPadding || 0)
+ bottomPadding: SafeArea.margins.bottom + (config.bottomPadding || 0)
+ leftPadding: SafeArea.margins.left + (config.leftPadding || 0)
+ rightPadding: SafeArea.margins.right + (config.rightPadding || 0)
readonly property var config: Config.controls.toolbar["normal"] || {}
diff --git a/src/quickcontrols/fluentwinui3/ToolBar.qml b/src/quickcontrols/fluentwinui3/ToolBar.qml
index 8c962bb4d9..bb8c5cf47f 100644
--- a/src/quickcontrols/fluentwinui3/ToolBar.qml
+++ b/src/quickcontrols/fluentwinui3/ToolBar.qml
@@ -14,10 +14,10 @@ T.ToolBar {
spacing: config.spacing || 0
- topPadding: config.topPadding || 0
- bottomPadding: config.bottomPadding || 0
- leftPadding: config.leftPadding || 0
- rightPadding: config.rightPadding || 0
+ topPadding: SafeArea.margins.top + (config.topPadding || 0)
+ bottomPadding: SafeArea.margins.bottom + (config.bottomPadding || 0)
+ leftPadding: SafeArea.margins.left + (config.leftPadding || 0)
+ rightPadding: SafeArea.margins.right + (config.rightPadding || 0)
topInset: -config.topInset || 0
bottomInset: -config.bottomInset || 0
diff --git a/src/quickcontrols/fusion/MenuBar.qml b/src/quickcontrols/fusion/MenuBar.qml
index 327d107926..226b4388e3 100644
--- a/src/quickcontrols/fusion/MenuBar.qml
+++ b/src/quickcontrols/fusion/MenuBar.qml
@@ -15,6 +15,11 @@ T.MenuBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
+ topPadding: SafeArea.margins.top
+ leftPadding: SafeArea.margins.left
+ rightPadding: SafeArea.margins.right
+ bottomPadding: SafeArea.margins.bottom
+
delegate: MenuBarItem { }
contentItem: Row {
diff --git a/src/quickcontrols/fusion/ToolBar.qml b/src/quickcontrols/fusion/ToolBar.qml
index 697ca35663..3d593c23fb 100644
--- a/src/quickcontrols/fusion/ToolBar.qml
+++ b/src/quickcontrols/fusion/ToolBar.qml
@@ -15,9 +15,13 @@ T.ToolBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
- horizontalPadding: 6
- topPadding: control.position === T.ToolBar.Footer ? 1 : 0
- bottomPadding: control.position === T.ToolBar.Header ? 1 : 0
+ leftPadding: SafeArea.margins.left + 6
+ rightPadding: SafeArea.margins.right + 6
+
+ topPadding: SafeArea.margins.top
+ + (control.position === T.ToolBar.Footer ? 1 : 0)
+ bottomPadding: SafeArea.margins.bottom
+ + (control.position === T.ToolBar.Header ? 1 : 0)
background: Rectangle {
implicitHeight: 26
diff --git a/src/quickcontrols/imagine/ToolBar.qml b/src/quickcontrols/imagine/ToolBar.qml
index d2746e359b..b53886cbf9 100644
--- a/src/quickcontrols/imagine/ToolBar.qml
+++ b/src/quickcontrols/imagine/ToolBar.qml
@@ -14,10 +14,10 @@ T.ToolBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
- topPadding: background ? background.topPadding : 0
- leftPadding: background ? background.leftPadding : 0
- rightPadding: background ? background.rightPadding : 0
- bottomPadding: background ? background.bottomPadding : 0
+ topPadding: SafeArea.margins.top + (background ? background.topPadding : 0)
+ leftPadding: SafeArea.margins.left + (background ? background.leftPadding : 0)
+ rightPadding: SafeArea.margins.right + (background ? background.rightPadding : 0)
+ bottomPadding: SafeArea.margins.bottom + (background ? background.bottomPadding : 0)
topInset: background ? -background.topInset || 0 : 0
leftInset: background ? -background.leftInset || 0 : 0
diff --git a/src/quickcontrols/ios/MenuBar.qml b/src/quickcontrols/ios/MenuBar.qml
index ea7a0ab608..ce6f3c8244 100644
--- a/src/quickcontrols/ios/MenuBar.qml
+++ b/src/quickcontrols/ios/MenuBar.qml
@@ -13,6 +13,11 @@ T.MenuBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
+ topPadding: SafeArea.margins.top
+ leftPadding: SafeArea.margins.left
+ rightPadding: SafeArea.margins.right
+ bottomPadding: SafeArea.margins.bottom
+
delegate: MenuBarItem { }
contentItem: Row {
diff --git a/src/quickcontrols/ios/ToolBar.qml b/src/quickcontrols/ios/ToolBar.qml
index 5ae9d2a88a..ac616af6f9 100644
--- a/src/quickcontrols/ios/ToolBar.qml
+++ b/src/quickcontrols/ios/ToolBar.qml
@@ -13,6 +13,11 @@ T.ToolBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
+ topPadding: SafeArea.margins.top
+ leftPadding: SafeArea.margins.left
+ rightPadding: SafeArea.margins.right
+ bottomPadding: SafeArea.margins.bottom
+
background: Rectangle {
implicitHeight: 49
color: Application.styleHints.colorScheme === Qt.Dark ? control.palette.light : control.palette.base
diff --git a/src/quickcontrols/macos/MenuBar.qml b/src/quickcontrols/macos/MenuBar.qml
index b979fbbdb4..f6db0a1d40 100644
--- a/src/quickcontrols/macos/MenuBar.qml
+++ b/src/quickcontrols/macos/MenuBar.qml
@@ -13,10 +13,10 @@ T.MenuBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
- leftPadding: 6
- rightPadding: 6
- topPadding: 3
- bottomPadding: 2
+ leftPadding: SafeArea.margins.left + 6
+ rightPadding: SafeArea.margins.right + 6
+ topPadding: SafeArea.margins.top + 3
+ bottomPadding: SafeArea.margins.bottom + 2
spacing: 4
delegate: MenuBarItem { }
diff --git a/src/quickcontrols/material/MenuBar.qml b/src/quickcontrols/material/MenuBar.qml
index 6a3ec3a676..bd48f08b71 100644
--- a/src/quickcontrols/material/MenuBar.qml
+++ b/src/quickcontrols/material/MenuBar.qml
@@ -15,6 +15,11 @@ T.MenuBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
+ topPadding: SafeArea.margins.top
+ leftPadding: SafeArea.margins.left
+ rightPadding: SafeArea.margins.right
+ bottomPadding: SafeArea.margins.bottom
+
delegate: MenuBarItem { }
contentItem: Row {
diff --git a/src/quickcontrols/material/ToolBar.qml b/src/quickcontrols/material/ToolBar.qml
index 9838d47c36..584e9254e5 100644
--- a/src/quickcontrols/material/ToolBar.qml
+++ b/src/quickcontrols/material/ToolBar.qml
@@ -16,6 +16,11 @@ T.ToolBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
+ topPadding: SafeArea.margins.top
+ leftPadding: SafeArea.margins.left
+ rightPadding: SafeArea.margins.right
+ bottomPadding: SafeArea.margins.bottom
+
Material.foreground: Material.toolTextColor
spacing: 16
diff --git a/src/quickcontrols/universal/MenuBar.qml b/src/quickcontrols/universal/MenuBar.qml
index eebc5d8df0..bfe2d6f3c7 100644
--- a/src/quickcontrols/universal/MenuBar.qml
+++ b/src/quickcontrols/universal/MenuBar.qml
@@ -14,6 +14,11 @@ T.MenuBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
+ topPadding: SafeArea.margins.top
+ leftPadding: SafeArea.margins.left
+ rightPadding: SafeArea.margins.right
+ bottomPadding: SafeArea.margins.bottom
+
delegate: MenuBarItem { }
contentItem: Row {
diff --git a/src/quickcontrols/universal/ToolBar.qml b/src/quickcontrols/universal/ToolBar.qml
index 2870445be5..40a928ee93 100644
--- a/src/quickcontrols/universal/ToolBar.qml
+++ b/src/quickcontrols/universal/ToolBar.qml
@@ -13,6 +13,11 @@ T.ToolBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
+ topPadding: SafeArea.margins.top
+ leftPadding: SafeArea.margins.left
+ rightPadding: SafeArea.margins.right
+ bottomPadding: SafeArea.margins.bottom
+
background: Rectangle {
implicitHeight: 48 // AppBarThemeCompactHeight
color: control.Universal.chromeMediumColor
diff --git a/src/quickcontrols/windows/MenuBar.qml b/src/quickcontrols/windows/MenuBar.qml
index ba18959a17..9109927aa9 100644
--- a/src/quickcontrols/windows/MenuBar.qml
+++ b/src/quickcontrols/windows/MenuBar.qml
@@ -13,10 +13,10 @@ T.MenuBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
- leftPadding: 3
- rightPadding: 3
- topPadding: 3
- bottomPadding: 3
+ leftPadding: SafeArea.margins.left + 3
+ rightPadding: SafeArea.margins.right + 3
+ topPadding: SafeArea.margins.top + 3
+ bottomPadding: SafeArea.margins.bottom + 3
spacing: 10
delegate: MenuBarItem { }
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 08:30:01 +0000