mirrors/Sandboxie
mirrors
/
Sandboxie
mirror of https://github.com/sandboxie-plus/Sandboxie.git
1
0
Fork 0
Code Releases Activity

Preserve tab orders when merging tabs

This commit is contained in:
gexgd0419 2024-10-17 00:04:26 +08:00
parent 48d9eb83b3
commit 795e8e2277
1 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
SandboxiePlus/SandMan/Windows/OptionsWindow.cpp
View File

@ -10,6 +10,55 @@
#include "../Wizards/TemplateWizard.h"
static bool IsAncestorOf(QObject* container, QObject* obj)
{
while (obj)
{
if (obj == container)
return true;
obj = obj->parent();
}
return false;
}
static QWidgetList GetTabOrder(QObject* container)
{
QWidgetList list;
QWidget* pWidget = container->findChild<QWidget*>();
if (!pWidget)
return list;
list.append(pWidget);
for (QWidget* pPrev = pWidget->previousInFocusChain();
pPrev && IsAncestorOf(container, pPrev);
pPrev = pPrev->previousInFocusChain())
{
list.prepend(pPrev);
}
for (QWidget* pNext = pWidget->nextInFocusChain();
pNext && IsAncestorOf(container, pNext);
pNext = pNext->nextInFocusChain())
{
list.append(pNext);
}
return list;
}
static void RestoreTabOrder(const QWidgetList& list)
{
QWidget* pPrev = nullptr;
for (QWidget* pWidget : list)
{
if (pPrev)
QWidget::setTabOrder(pPrev, pWidget);
pPrev = pWidget;
}
}
class NoEditDelegate : public QStyledItemDelegate {
public:
NoEditDelegate(QObject* parent = 0) : QStyledItemDelegate(parent) {}
@ -275,12 +324,14 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
pDummy->setVisible(false);
// merge recovery tabs
QWidgetList tabOrder = GetTabOrder(ui.tabsRecovery);
QWidget* pWidget3 = new QWidget();
pWidget3->setLayout(ui.gridLayout_10);
ui.gridLayout_24->addWidget(pWidget3, 1, 0);
QWidget* pWidget4 = new QWidget();
pWidget4->setLayout(ui.gridLayout_56);
ui.gridLayout_24->addWidget(pWidget4, 2, 0);
RestoreTabOrder(tabOrder);
delete ui.tabsRecovery;
ui.gridLayout_24->setContentsMargins(0, 0, 0, 0);
@ -306,6 +357,7 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
if (iOptionLayout == 1)
{
// merge stop tabs
tabOrder = GetTabOrder(ui.tabsStop);
QWidget* pWidget1 = new QWidget();
pWidget1->setLayout(ui.gridLayout_57);
ui.gridLayout_17->addWidget(pWidget1, 1, 0);
@ -319,6 +371,7 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
ui.lblStopOpt->setVisible(false);
ui.lblStopOpt->setProperty("hidden", true);
ui.gridLayout_17->addWidget(pWidget3, 3, 0);
RestoreTabOrder(tabOrder);
delete ui.tabsStop;
ui.gridLayout_17->setContentsMargins(0, 0, 0, 0);