From ac4fd2297fda3b1e560b40e3e2e27fb9e5eb4d2e Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Sun, 31 Mar 2024 12:54:47 -0700 Subject: [PATCH] CheatsManager: Allow making the window smaller Move CheatManager's child widgets into scroll areas to allow making the window smaller than the default. In CheatSearchWidget, enable word wrapping for the label describing the address space and search type to help it fit better inside a narrower window. --- Source/Core/DolphinQt/CheatSearchFactoryWidget.cpp | 3 ++- Source/Core/DolphinQt/CheatSearchWidget.cpp | 5 ++++- Source/Core/DolphinQt/Config/ARCodeWidget.cpp | 3 ++- Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinQt/CheatSearchFactoryWidget.cpp b/Source/Core/DolphinQt/CheatSearchFactoryWidget.cpp index bbe262c469..3c51e36812 100644 --- a/Source/Core/DolphinQt/CheatSearchFactoryWidget.cpp +++ b/Source/Core/DolphinQt/CheatSearchFactoryWidget.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "DolphinQt/CheatSearchFactoryWidget.h" +#include "DolphinQt/QtUtils/WrapInScrollArea.h" #include #include @@ -124,7 +125,7 @@ void CheatSearchFactoryWidget::CreateWidgets() layout->addStretch(); - setLayout(layout); + WrapInScrollArea(this, layout); } void CheatSearchFactoryWidget::ConnectWidgets() diff --git a/Source/Core/DolphinQt/CheatSearchWidget.cpp b/Source/Core/DolphinQt/CheatSearchWidget.cpp index 73bf6df95f..196a93ed32 100644 --- a/Source/Core/DolphinQt/CheatSearchWidget.cpp +++ b/Source/Core/DolphinQt/CheatSearchWidget.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "DolphinQt/CheatSearchWidget.h" +#include "DolphinQt/QtUtils/WrapInScrollArea.h" #include #include @@ -174,6 +175,7 @@ void CheatSearchWidget::CreateWidgets() } QString aligned = m_session->GetAligned() ? tr("aligned") : tr("unaligned"); session_info_label->setText(tr("%1, %2, %3, %4").arg(ranges).arg(space).arg(type).arg(aligned)); + session_info_label->setWordWrap(true); } // i18n: This label is followed by a dropdown where the user can select things like "is equal to" @@ -256,7 +258,8 @@ void CheatSearchWidget::CreateWidgets() layout->addWidget(m_info_label_1); layout->addWidget(m_info_label_2); layout->addWidget(m_address_table); - setLayout(layout); + + WrapInScrollArea(this, layout); } void CheatSearchWidget::ConnectWidgets() diff --git a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp index 276318f573..93f0d7e589 100644 --- a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp +++ b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "DolphinQt/Config/ARCodeWidget.h" +#include "DolphinQt/QtUtils/WrapInScrollArea.h" #include #include @@ -86,7 +87,7 @@ void ARCodeWidget::CreateWidgets() layout->addWidget(m_code_list); layout->addLayout(button_layout); - setLayout(layout); + WrapInScrollArea(this, layout); } void ARCodeWidget::ConnectWidgets() diff --git a/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp b/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp index 1aa6afb643..7f37241ee6 100644 --- a/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp +++ b/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "DolphinQt/Config/GeckoCodeWidget.h" +#include "DolphinQt/QtUtils/WrapInScrollArea.h" #include #include @@ -138,7 +139,7 @@ void GeckoCodeWidget::CreateWidgets() layout->addLayout(btn_layout); - setLayout(layout); + WrapInScrollArea(this, layout); } void GeckoCodeWidget::ConnectWidgets()