From 8f1a7ca5acd96d74bce3d6d933896c1ab2a7f47e Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 19:30:46 -0500 Subject: [PATCH 01/19] Reorganize the layout of Fancy Menu's widgets --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index 7a36ca1ec..6bb1e13d8 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -219,16 +219,15 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent) mMainLayout = new QVBoxLayout(this); - mMainLayout->addWidget(mSearchEdit); - mViewLayout = new QHBoxLayout; mViewLayout->addWidget(mAppView, APP_VIEW_STRETCH); mViewLayout->addWidget(mCategoryView, CAT_VIEW_STRETCH); mMainLayout->addLayout(mViewLayout); mButtonsLayout = new QHBoxLayout; - mButtonsLayout->addWidget(mAboutButton); + mButtonsLayout->addWidget(mSearchEdit, APP_VIEW_STRETCH); mButtonsLayout->addStretch(); + mButtonsLayout->addWidget(mAboutButton); mButtonsLayout->addWidget(mSettingsButton); mButtonsLayout->addWidget(mPowerButton); mMainLayout->addLayout(mButtonsLayout); From d3e37ff9a70e440b7dc2df2dfbe775d6417175b1 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 19:51:32 -0500 Subject: [PATCH 02/19] Reorganize the layout of Fancy Menu's interface --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 9 +++++++-- plugin-fancymenu/lxqtfancymenuwindow.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index 6bb1e13d8..bb061adb3 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -224,13 +224,18 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent) mViewLayout->addWidget(mCategoryView, CAT_VIEW_STRETCH); mMainLayout->addLayout(mViewLayout); + mLowerLayout = new QHBoxLayout; + mButtonsLayout = new QHBoxLayout; - mButtonsLayout->addWidget(mSearchEdit, APP_VIEW_STRETCH); mButtonsLayout->addStretch(); mButtonsLayout->addWidget(mAboutButton); mButtonsLayout->addWidget(mSettingsButton); mButtonsLayout->addWidget(mPowerButton); - mMainLayout->addLayout(mButtonsLayout); + + mLowerLayout->addWidget(mSearchEdit, APP_VIEW_STRETCH); + mLowerLayout->addLayout(mButtonsLayout, CAT_VIEW_STRETCH); + + mMainLayout->addLayout(mLowerLayout); updateButtonIconSize(); diff --git a/plugin-fancymenu/lxqtfancymenuwindow.h b/plugin-fancymenu/lxqtfancymenuwindow.h index fb6f487af..eb1ea6dfa 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.h +++ b/plugin-fancymenu/lxqtfancymenuwindow.h @@ -128,6 +128,7 @@ private slots: static const int CAT_VIEW_STRETCH = 2; QVBoxLayout *mMainLayout; + QHBoxLayout *mLowerLayout; QHBoxLayout *mButtonsLayout; QHBoxLayout *mViewLayout; From 5b5e6f531be7a34b763204e485b9e4e827b64c0f Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 19:54:37 -0500 Subject: [PATCH 03/19] Update lxqtfancymenuwindow.cpp --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index bb061adb3..8ee56bffa 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -227,7 +227,6 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent) mLowerLayout = new QHBoxLayout; mButtonsLayout = new QHBoxLayout; - mButtonsLayout->addStretch(); mButtonsLayout->addWidget(mAboutButton); mButtonsLayout->addWidget(mSettingsButton); mButtonsLayout->addWidget(mPowerButton); From f48380fbc7647e5e9f273a87da6d7c5092c27479 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:03:48 -0500 Subject: [PATCH 04/19] Update lxqtfancymenuwindow.cpp --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index 8ee56bffa..dcb264930 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -220,20 +220,20 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent) mMainLayout = new QVBoxLayout(this); mViewLayout = new QHBoxLayout; + mButtonsLayout = new QHBoxLayout; + mLowerLayout = new QHBoxLayout; + mViewLayout->addWidget(mAppView, APP_VIEW_STRETCH); mViewLayout->addWidget(mCategoryView, CAT_VIEW_STRETCH); - mMainLayout->addLayout(mViewLayout); - - mLowerLayout = new QHBoxLayout; - - mButtonsLayout = new QHBoxLayout; + mButtonsLayout->addWidget(mAboutButton); mButtonsLayout->addWidget(mSettingsButton); mButtonsLayout->addWidget(mPowerButton); mLowerLayout->addWidget(mSearchEdit, APP_VIEW_STRETCH); mLowerLayout->addLayout(mButtonsLayout, CAT_VIEW_STRETCH); - + + mMainLayout->addLayout(mViewLayout); mMainLayout->addLayout(mLowerLayout); updateButtonIconSize(); From c794895e084b843c8edf53c493582a81d3bfc298 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:17:30 -0500 Subject: [PATCH 05/19] Update lxqtfancymenuwindow.h --- plugin-fancymenu/lxqtfancymenuwindow.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.h b/plugin-fancymenu/lxqtfancymenuwindow.h index eb1ea6dfa..1bd14104c 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.h +++ b/plugin-fancymenu/lxqtfancymenuwindow.h @@ -128,9 +128,9 @@ private slots: static const int CAT_VIEW_STRETCH = 2; QVBoxLayout *mMainLayout; - QHBoxLayout *mLowerLayout; QHBoxLayout *mButtonsLayout; - QHBoxLayout *mViewLayout; + QHBoxLayout *mUpperLayout; + QHBoxLayout *mLowerLayout; QToolButton *mSettingsButton; QToolButton *mPowerButton; From 7c2fa9bb4c21fa2a6cf806573063e343837372b4 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:26:37 -0500 Subject: [PATCH 06/19] Update lxqtfancymenuwindow.cpp --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index dcb264930..788d5880a 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -227,7 +227,9 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent) mViewLayout->addWidget(mCategoryView, CAT_VIEW_STRETCH); mButtonsLayout->addWidget(mAboutButton); + mButtonsLayout->addStretch(); mButtonsLayout->addWidget(mSettingsButton); + mButtonsLayout->addStretch(); mButtonsLayout->addWidget(mPowerButton); mLowerLayout->addWidget(mSearchEdit, APP_VIEW_STRETCH); From ce4da81e70a9d82f9199f27274b44d141cf7b142 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:27:37 -0500 Subject: [PATCH 07/19] Update lxqtfancymenuwindow.h --- plugin-fancymenu/lxqtfancymenuwindow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.h b/plugin-fancymenu/lxqtfancymenuwindow.h index 1bd14104c..3fc17ebfd 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.h +++ b/plugin-fancymenu/lxqtfancymenuwindow.h @@ -129,7 +129,7 @@ private slots: QVBoxLayout *mMainLayout; QHBoxLayout *mButtonsLayout; - QHBoxLayout *mUpperLayout; + QHBoxLayout *mViewLayout; QHBoxLayout *mLowerLayout; QToolButton *mSettingsButton; From 657d6de5bc8290ec89282a179dcd1ff7b17d81d3 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:37:35 -0500 Subject: [PATCH 08/19] Update lxqtfancymenuwindow.h --- plugin-fancymenu/lxqtfancymenuwindow.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.h b/plugin-fancymenu/lxqtfancymenuwindow.h index 3fc17ebfd..3b5371f46 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.h +++ b/plugin-fancymenu/lxqtfancymenuwindow.h @@ -127,10 +127,10 @@ private slots: static const int APP_VIEW_STRETCH = 3; static const int CAT_VIEW_STRETCH = 2; - QVBoxLayout *mMainLayout; + QHBoxLayout *mMainLayout; QHBoxLayout *mButtonsLayout; - QHBoxLayout *mViewLayout; - QHBoxLayout *mLowerLayout; + QHVoxLayout *mLeftLayout; + QHBoxLayout *mRightLayout; QToolButton *mSettingsButton; QToolButton *mPowerButton; From 84fbe091cc7f0a20e16d630c4984b678ef2fde56 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:41:00 -0500 Subject: [PATCH 09/19] Update lxqtfancymenuwindow.cpp --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index 788d5880a..6e9bee201 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -217,26 +217,26 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent) connect(mCategoryView->selectionModel(), &QItemSelectionModel::currentChanged, this, &LXQtFancyMenuWindow::activateCategory); - mMainLayout = new QVBoxLayout(this); - - mViewLayout = new QHBoxLayout; + mMainLayout = new QHBoxLayout(this); mButtonsLayout = new QHBoxLayout; - mLowerLayout = new QHBoxLayout; - - mViewLayout->addWidget(mAppView, APP_VIEW_STRETCH); - mViewLayout->addWidget(mCategoryView, CAT_VIEW_STRETCH); - + + mLeftLayout = new QVBoxLayout; + mRightLayout = new QVBoxLayout; + mButtonsLayout->addWidget(mAboutButton); mButtonsLayout->addStretch(); mButtonsLayout->addWidget(mSettingsButton); mButtonsLayout->addStretch(); mButtonsLayout->addWidget(mPowerButton); - - mLowerLayout->addWidget(mSearchEdit, APP_VIEW_STRETCH); - mLowerLayout->addLayout(mButtonsLayout, CAT_VIEW_STRETCH); - mMainLayout->addLayout(mViewLayout); - mMainLayout->addLayout(mLowerLayout); + mLeftLayout->addWidget(mAppView, APP_VIEW_STRETCH); + mLeftLayout->addWidget(mSearchEdit, APP_VIEW_STRETCH); + + mRightLayout->addWidget(mCategoryEdit, CAT_VIEW_STRETCH); + mRightLayout->addLayout(mButtonsLayout, CAT_VIEW_STRETCH); + + mMainLayout->addLayout(mLeftLayout); + mMainLayout->addLayout(mRightLayout); updateButtonIconSize(); From 2276b6107212646296c2b6d154a9e0466ebbca55 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:43:01 -0500 Subject: [PATCH 10/19] Update lxqtfancymenuwindow.h --- plugin-fancymenu/lxqtfancymenuwindow.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.h b/plugin-fancymenu/lxqtfancymenuwindow.h index 3b5371f46..bd052ea69 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.h +++ b/plugin-fancymenu/lxqtfancymenuwindow.h @@ -129,8 +129,8 @@ private slots: QHBoxLayout *mMainLayout; QHBoxLayout *mButtonsLayout; - QHVoxLayout *mLeftLayout; - QHBoxLayout *mRightLayout; + QVBoxLayout *mLeftLayout; + QVBoxLayout *mRightLayout; QToolButton *mSettingsButton; QToolButton *mPowerButton; From 7dbcd152b8d21f209370f87852cafa110abc7293 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:45:23 -0500 Subject: [PATCH 11/19] Update lxqtfancymenuwindow.cpp --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index 6e9bee201..837e6485c 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -232,7 +232,7 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent) mLeftLayout->addWidget(mAppView, APP_VIEW_STRETCH); mLeftLayout->addWidget(mSearchEdit, APP_VIEW_STRETCH); - mRightLayout->addWidget(mCategoryEdit, CAT_VIEW_STRETCH); + mRightLayout->addWidget(mCategoryView, CAT_VIEW_STRETCH); mRightLayout->addLayout(mButtonsLayout, CAT_VIEW_STRETCH); mMainLayout->addLayout(mLeftLayout); @@ -761,7 +761,7 @@ void LXQtFancyMenuWindow::setButtonPosition(LXQtFancyMenuButtonPosition pos) void LXQtFancyMenuWindow::setCategoryPosition(LXQtFancyMenuCategoryPosition pos) { - mViewLayout->removeWidget(mCategoryView); + mRightLayout->removeWidget(mCategoryView); int idx = 0; if(pos == LXQtFancyMenuCategoryPosition::Right) idx = -1; From 2dd66e7e4109c9f83979ddfede05a0441ed90be0 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:48:15 -0500 Subject: [PATCH 12/19] Update lxqtfancymenuwindow.cpp --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index 837e6485c..bb8b98810 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -766,7 +766,7 @@ void LXQtFancyMenuWindow::setCategoryPosition(LXQtFancyMenuCategoryPosition pos) if(pos == LXQtFancyMenuCategoryPosition::Right) idx = -1; - mViewLayout->insertWidget(idx, mCategoryView, CAT_VIEW_STRETCH); + mRightLayout->insertWidget(idx, mCategoryView, CAT_VIEW_STRETCH); } void LXQtFancyMenuWindow::updateButtonIconSize() From 5d4b3956afc406524c51c9e01d8b37ade959f747 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:53:28 -0500 Subject: [PATCH 13/19] Update lxqtfancymenuwindow.cpp --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index bb8b98810..fcc755dc1 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -224,9 +224,7 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent) mRightLayout = new QVBoxLayout; mButtonsLayout->addWidget(mAboutButton); - mButtonsLayout->addStretch(); mButtonsLayout->addWidget(mSettingsButton); - mButtonsLayout->addStretch(); mButtonsLayout->addWidget(mPowerButton); mLeftLayout->addWidget(mAppView, APP_VIEW_STRETCH); From 494236e3fdfe9919c13aa550e4984b00025ad59d Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:57:21 -0500 Subject: [PATCH 14/19] Update lxqtfancymenuwindow.cpp --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index fcc755dc1..e4b4c4db5 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -227,14 +227,14 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent) mButtonsLayout->addWidget(mSettingsButton); mButtonsLayout->addWidget(mPowerButton); - mLeftLayout->addWidget(mAppView, APP_VIEW_STRETCH); - mLeftLayout->addWidget(mSearchEdit, APP_VIEW_STRETCH); + mLeftLayout->addWidget(mAppView); + mLeftLayout->addWidget(mSearchEdit); - mRightLayout->addWidget(mCategoryView, CAT_VIEW_STRETCH); - mRightLayout->addLayout(mButtonsLayout, CAT_VIEW_STRETCH); + mRightLayout->addWidget(mCategoryView); + mRightLayout->addLayout(mButtonsLayout); - mMainLayout->addLayout(mLeftLayout); - mMainLayout->addLayout(mRightLayout); + mMainLayout->addLayout(mLeftLayout, APP_VIEW_STRETCH); + mMainLayout->addLayout(mRightLayout, CAT_VIEW_STRETCH); updateButtonIconSize(); From 042beba09db0f5f8194bf6628856f8fc3d26094e Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:10:10 -0500 Subject: [PATCH 15/19] Update lxqtfancymenuwindow.h --- plugin-fancymenu/lxqtfancymenuwindow.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.h b/plugin-fancymenu/lxqtfancymenuwindow.h index bd052ea69..499103bdc 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.h +++ b/plugin-fancymenu/lxqtfancymenuwindow.h @@ -42,6 +42,7 @@ class QModelIndex; class QHBoxLayout; class QVBoxLayout; +class QGridLayout; class XdgMenu; @@ -127,7 +128,7 @@ private slots: static const int APP_VIEW_STRETCH = 3; static const int CAT_VIEW_STRETCH = 2; - QHBoxLayout *mMainLayout; + QGridLayout *mMainLayout; QHBoxLayout *mButtonsLayout; QVBoxLayout *mLeftLayout; QVBoxLayout *mRightLayout; From b1420f4fecc263ae5324213a6ac8357a1829f8f9 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:18:43 -0500 Subject: [PATCH 16/19] Update lxqtfancymenuwindow.cpp --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index e4b4c4db5..658b11e99 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -217,24 +217,17 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent) connect(mCategoryView->selectionModel(), &QItemSelectionModel::currentChanged, this, &LXQtFancyMenuWindow::activateCategory); - mMainLayout = new QHBoxLayout(this); + mMainLayout = new QGridLayout(this); mButtonsLayout = new QHBoxLayout; - mLeftLayout = new QVBoxLayout; - mRightLayout = new QVBoxLayout; - mButtonsLayout->addWidget(mAboutButton); mButtonsLayout->addWidget(mSettingsButton); mButtonsLayout->addWidget(mPowerButton); - - mLeftLayout->addWidget(mAppView); - mLeftLayout->addWidget(mSearchEdit); - - mRightLayout->addWidget(mCategoryView); - mRightLayout->addLayout(mButtonsLayout); - - mMainLayout->addLayout(mLeftLayout, APP_VIEW_STRETCH); - mMainLayout->addLayout(mRightLayout, CAT_VIEW_STRETCH); + + mMainLayout->addWidget(mAppView, 0, 0); + mMainLayout->addWidget(mCategoryView, 0, 1); + mMainLayout->addWidget(mSearchEdit, 1, 0); + mMainLayout->addLayout(mButtonsLayout, 1, 1); updateButtonIconSize(); @@ -759,12 +752,12 @@ void LXQtFancyMenuWindow::setButtonPosition(LXQtFancyMenuButtonPosition pos) void LXQtFancyMenuWindow::setCategoryPosition(LXQtFancyMenuCategoryPosition pos) { - mRightLayout->removeWidget(mCategoryView); + mMainLayout->removeWidget(mCategoryView); int idx = 0; if(pos == LXQtFancyMenuCategoryPosition::Right) idx = -1; - mRightLayout->insertWidget(idx, mCategoryView, CAT_VIEW_STRETCH); + mMainLayout->insertWidget(idx, mCategoryView, CAT_VIEW_STRETCH); } void LXQtFancyMenuWindow::updateButtonIconSize() From 3bb5efbb2d7d8062fc96f838a04fe8a55b96f5b8 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:20:24 -0500 Subject: [PATCH 17/19] Update lxqtfancymenuwindow.cpp --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index 658b11e99..4f5414336 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -740,7 +740,7 @@ void LXQtFancyMenuWindow::setFilterClear(bool newFilterClear) } } -void LXQtFancyMenuWindow::setButtonPosition(LXQtFancyMenuButtonPosition pos) +/*void LXQtFancyMenuWindow::setButtonPosition(LXQtFancyMenuButtonPosition pos) { mMainLayout->removeItem(mButtonsLayout); int idx = 0; @@ -758,7 +758,7 @@ void LXQtFancyMenuWindow::setCategoryPosition(LXQtFancyMenuCategoryPosition pos) idx = -1; mMainLayout->insertWidget(idx, mCategoryView, CAT_VIEW_STRETCH); -} +}*/ void LXQtFancyMenuWindow::updateButtonIconSize() { From 06adeed4ce586bf540995084ea1c2843c4aee646 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:25:23 -0500 Subject: [PATCH 18/19] Update lxqtfancymenuwindow.cpp --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index 4f5414336..5ee131bce 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -740,25 +740,13 @@ void LXQtFancyMenuWindow::setFilterClear(bool newFilterClear) } } -/*void LXQtFancyMenuWindow::setButtonPosition(LXQtFancyMenuButtonPosition pos) +void LXQtFancyMenuWindow::setButtonPosition(LXQtFancyMenuButtonPosition pos) { - mMainLayout->removeItem(mButtonsLayout); - int idx = 0; - if(pos == LXQtFancyMenuButtonPosition::Bottom) - idx = -1; - - mMainLayout->insertLayout(idx, mButtonsLayout); } void LXQtFancyMenuWindow::setCategoryPosition(LXQtFancyMenuCategoryPosition pos) { - mMainLayout->removeWidget(mCategoryView); - int idx = 0; - if(pos == LXQtFancyMenuCategoryPosition::Right) - idx = -1; - - mMainLayout->insertWidget(idx, mCategoryView, CAT_VIEW_STRETCH); -}*/ +} void LXQtFancyMenuWindow::updateButtonIconSize() { From c0d39707d85b81d4421dbb1e291ff17a8ae52d77 Mon Sep 17 00:00:00 2001 From: AzumaHazuki <67122280+AzumaHazuki@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:35:48 -0500 Subject: [PATCH 19/19] Update lxqtfancymenuwindow.cpp --- plugin-fancymenu/lxqtfancymenuwindow.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp index 5ee131bce..9ce53e407 100644 --- a/plugin-fancymenu/lxqtfancymenuwindow.cpp +++ b/plugin-fancymenu/lxqtfancymenuwindow.cpp @@ -224,6 +224,9 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent) mButtonsLayout->addWidget(mSettingsButton); mButtonsLayout->addWidget(mPowerButton); + mMainLayout->setColumnStretch(0,3); + mMainLayout->setColumnStretch(1,2); + mMainLayout->addWidget(mAppView, 0, 0); mMainLayout->addWidget(mCategoryView, 0, 1); mMainLayout->addWidget(mSearchEdit, 1, 0);