From ed8467ad577f1984a5974a944fca5965e4f29c75 Mon Sep 17 00:00:00 2001
From: Mohsen <mohsen_d98@yahoo.com>
Date: Sat, 11 Jan 2025 19:38:29 +0330
Subject: [PATCH] Try to fix margins.

---
 src/qml/DashBoard.qml     |  1 +
 src/qml/WelcomeScreen.qml | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/qml/DashBoard.qml b/src/qml/DashBoard.qml
index f4c6aa462e..431495a9a0 100644
--- a/src/qml/DashBoard.qml
+++ b/src/qml/DashBoard.qml
@@ -353,6 +353,7 @@ Drawer {
     height: 48
     width: parent.width
     anchors.bottom: parent.bottom
+    anchors.bottomMargin: mainWindow.sceneBottomMargin
     color: Theme.darkTheme ? Theme.mainBackgroundColorSemiOpaque : Theme.lightestGray
 
     MenuItem {
diff --git a/src/qml/WelcomeScreen.qml b/src/qml/WelcomeScreen.qml
index f3e0f0fecd..c70c50925d 100644
--- a/src/qml/WelcomeScreen.qml
+++ b/src/qml/WelcomeScreen.qml
@@ -788,7 +788,7 @@ Page {
     anchors {
       top: parent.top
       left: parent.left
-      margins: mainWindow.sceneTopMargin + 4
+      margins: mainWindow.sceneTopMargin
     }
 
     QfActionButton {
@@ -803,20 +803,15 @@ Page {
       }
     }
 
-    Rectangle {
-      width: 48
-      height: 48
-      color: Theme.toolButtonBackgroundColor
-      radius: height / 2
+    QfToolButton {
+      id: settingsButton
+      iconSource: Theme.getThemeVectorIcon('ic_tune_24dp')
+      iconColor: Theme.toolButtonColor
+      bgcolor: Theme.toolButtonBackgroundColor
+      round: true
 
-      QfToolButton {
-        id: settingsButton
-        iconSource: Theme.getThemeVectorIcon('ic_tune_24dp')
-        iconColor: Theme.toolButtonColor
-
-        onClicked: {
-          showSettings();
-        }
+      onClicked: {
+        showSettings();
       }
     }
   }