From 6e9574e2bee64d07573db992582b5d2959469292 Mon Sep 17 00:00:00 2001 From: DavidXanatos Date: Sun, 12 Sep 2021 07:49:06 +0200 Subject: [PATCH] Build 0.9.6 --- SandboxiePlus/SandMan/SbiePlusAPI.cpp | 4 +++- SandboxiePlus/SandMan/Views/SbieView.cpp | 3 +-- SandboxiePlus/SandMan/Windows/RecoveryWindow.cpp | 9 +++++---- SandboxiePlus/SandMan/Windows/SelectBoxWindow.cpp | 9 +++++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/SandboxiePlus/SandMan/SbiePlusAPI.cpp b/SandboxiePlus/SandMan/SbiePlusAPI.cpp index ac0d3939..9afbb84b 100644 --- a/SandboxiePlus/SandMan/SbiePlusAPI.cpp +++ b/SandboxiePlus/SandMan/SbiePlusAPI.cpp @@ -429,7 +429,8 @@ QString CSbieProcess::ImageTypeToStr(quint32 type) FLASH_PLAYER_SANDBOX, PLUGIN_CONTAINER, OTHER_WEB_BROWSER, - OTHER_MAIL_CLIENT + OTHER_MAIL_CLIENT, + DLL_IMAGE_MOZILLA_THUNDERBIRD }; switch (type) @@ -465,6 +466,7 @@ QString CSbieProcess::ImageTypeToStr(quint32 type) case PLUGIN_CONTAINER: return tr("Firefox Plugin Container"); case OTHER_WEB_BROWSER: return tr("Generic Web Browser"); case OTHER_MAIL_CLIENT: return tr("Generic Mail Client"); + case DLL_IMAGE_MOZILLA_THUNDERBIRD: return tr("Thunderbird"); default: return tr(""); } } diff --git a/SandboxiePlus/SandMan/Views/SbieView.cpp b/SandboxiePlus/SandMan/Views/SbieView.cpp index 5e7d53e2..1c802cc1 100644 --- a/SandboxiePlus/SandMan/Views/SbieView.cpp +++ b/SandboxiePlus/SandMan/Views/SbieView.cpp @@ -46,7 +46,6 @@ CSbieView::CSbieView(QWidget* parent) : CPanelView(parent) m_pSbieTree->setSelectionMode(QAbstractItemView::ExtendedSelection); m_pSbieTree->setSortingEnabled(true); //m_pSbieTree->setSortingEnabled(false); - m_pSbieTree->setUniformRowHeights(true); //m_pSbieTree->header()->setSortIndicatorShown(true); //m_pSbieTree->header()->setSectionsClickable(true); connect(m_pSbieTree->header(), SIGNAL(sectionClicked(int)), this, SLOT(OnCustomSortByColumn(int))); @@ -1246,4 +1245,4 @@ void CSbieView::ShowOptions(const QString& Name) QModelIndex ModelIndex = m_pSortProxy->mapFromSource(Index); OnDoubleClicked(ModelIndex); -} +} \ No newline at end of file diff --git a/SandboxiePlus/SandMan/Windows/RecoveryWindow.cpp b/SandboxiePlus/SandMan/Windows/RecoveryWindow.cpp index 907ee780..f95a1349 100644 --- a/SandboxiePlus/SandMan/Windows/RecoveryWindow.cpp +++ b/SandboxiePlus/SandMan/Windows/RecoveryWindow.cpp @@ -32,10 +32,11 @@ CRecoveryWindow::CRecoveryWindow(const CSandBoxPtr& pBox, QWidget *parent) this->setWindowFlag(Qt::WindowStaysOnTopHint, bAlwaysOnTop); if (!bAlwaysOnTop) { - SetWindowPos((HWND)this->winId(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - QTimer::singleShot(100, this, [this]() { - SetWindowPos((HWND)this->winId(), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - }); + HWND hWnd = (HWND)this->winId(); + SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + QTimer::singleShot(100, this, [hWnd]() { + SetWindowPos(hWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + }); } ui.setupUi(this); diff --git a/SandboxiePlus/SandMan/Windows/SelectBoxWindow.cpp b/SandboxiePlus/SandMan/Windows/SelectBoxWindow.cpp index 1927abff..8901652e 100644 --- a/SandboxiePlus/SandMan/Windows/SelectBoxWindow.cpp +++ b/SandboxiePlus/SandMan/Windows/SelectBoxWindow.cpp @@ -33,10 +33,11 @@ CSelectBoxWindow::CSelectBoxWindow(const QStringList& Commands, const QString& B this->setWindowFlag(Qt::WindowStaysOnTopHint, bAlwaysOnTop); if (!bAlwaysOnTop) { - SetWindowPos((HWND)this->winId(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - QTimer::singleShot(100, this, [this]() { - SetWindowPos((HWND)this->winId(), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - }); + HWND hWnd = (HWND)this->winId(); + SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + QTimer::singleShot(100, this, [hWnd]() { + SetWindowPos(hWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + }); } ui.setupUi(this);