From 27aebc9304496d15c213426887a2d5b764184c57 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sun, 22 Mar 2020 12:43:12 +0200
Subject: [PATCH] insert Settings::Layout menu at correct position

---
 app/settings/controllers/layoutscontroller.cpp |  2 ++
 app/settings/handlers/tablayoutshandler.cpp    |  2 +-
 app/settings/settingsdialog.cpp                | 10 ++++++++++
 app/settings/settingsdialog.h                  |  3 +++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/settings/controllers/layoutscontroller.cpp b/app/settings/controllers/layoutscontroller.cpp
index b67312b56..4fd333980 100644
--- a/app/settings/controllers/layoutscontroller.cpp
+++ b/app/settings/controllers/layoutscontroller.cpp
@@ -460,6 +460,8 @@ void Layouts::loadLayouts()
         }
     }
 
+    updateLastColumnWidth();
+
     //! there are broken layouts and the user must be informed!
     if (brokenLayouts.count() > 0) {
         if (brokenLayouts.count() == 1) {
diff --git a/app/settings/handlers/tablayoutshandler.cpp b/app/settings/handlers/tablayoutshandler.cpp
index ff226aedf..477423143 100644
--- a/app/settings/handlers/tablayoutshandler.cpp
+++ b/app/settings/handlers/tablayoutshandler.cpp
@@ -106,7 +106,7 @@ void TabLayouts::initLayoutMenu()
 {
     if (!m_layoutMenu) {
         m_layoutMenu = new QMenu(i18n("Layout"), m_parentDialog->appMenuBar());
-        m_parentDialog->appMenuBar()->addMenu(m_layoutMenu);
+        m_parentDialog->appMenuBar()->insertMenu(m_parentDialog->helpMenu()->menuAction(), m_layoutMenu);
     }
 
     m_switchLayoutAction = m_layoutMenu->addAction(i18nc("switch layout","Switch"));
diff --git a/app/settings/settingsdialog.cpp b/app/settings/settingsdialog.cpp
index 057ff60f1..1b105e04c 100644
--- a/app/settings/settingsdialog.cpp
+++ b/app/settings/settingsdialog.cpp
@@ -247,6 +247,16 @@ QMenuBar *SettingsDialog::appMenuBar() const
     return m_globalMenuBar;
 }
 
+QMenu *SettingsDialog::fileMenu() const
+{
+    return m_fileMenu;
+}
+
+QMenu *SettingsDialog::helpMenu() const
+{
+    return m_helpMenu->menu();
+}
+
 Types::LatteConfigPage SettingsDialog::currentPage()
 {
     Types::LatteConfigPage cPage= static_cast<Types::LatteConfigPage>(m_ui->tabWidget->currentIndex());
diff --git a/app/settings/settingsdialog.h b/app/settings/settingsdialog.h
index 80e7db616..4ca2c7d48 100644
--- a/app/settings/settingsdialog.h
+++ b/app/settings/settingsdialog.h
@@ -70,7 +70,10 @@ public:
 
     Latte::Corona *corona() const;
     Ui::SettingsDialog *ui() const;
+
     QMenuBar *appMenuBar() const;
+    QMenu *fileMenu() const;
+    QMenu *helpMenu() const;
 
     void setStoredWindowSize(const QSize &size);