From a23c480e14d2ea62d099de0b10f5f619ad92573d Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Wed, 8 Nov 2023 08:53:07 +0200 Subject: [PATCH 1/3] [win] fix bug 36528 --- win-linux/src/ceditortools.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/win-linux/src/ceditortools.cpp b/win-linux/src/ceditortools.cpp index 9c1fcdf88..33b851d04 100644 --- a/win-linux/src/ceditortools.cpp +++ b/win-linux/src/ceditortools.cpp @@ -394,6 +394,9 @@ namespace CEditorTools AscAppManager::GetFileFormatByExtentionForSave(pSaveData->get_Path()); pSaveData->put_FileType(format > -1 ? format : 0); +#ifdef _WIN32 + Utils::addToRecent(_full_path.toStdWString()); +#endif } } From 22941cc9acfeed6af611410142b5f375b6628f98 Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Wed, 8 Nov 2023 09:41:35 +0200 Subject: [PATCH 2/3] [win] fix bug 62101 --- win-linux/src/components/cfiledialog.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win-linux/src/components/cfiledialog.cpp b/win-linux/src/components/cfiledialog.cpp index 195aedcc4..e80b8d2db 100644 --- a/win-linux/src/components/cfiledialog.cpp +++ b/win-linux/src/components/cfiledialog.cpp @@ -250,8 +250,10 @@ QStringList CFileDialogWrapper::modalOpen(const QString& path, const QString& fi tr("Presentations") + " (*.pptx *.ppt *.odp *.otp *.ppsm *.ppsx *.pps *.potx *.pot *.potm *.fodp *.dps *.dpt *.sxi);;" + tr("Web Page") + " (*.html *.htm *.mht *.mhtml *.epub);;" + tr("Text files") + " (*.txt *.csv)"; +#ifdef __linux__ _all_sup_files = tr("All supported files") + " " + joinExtentions(_filter_); _filter_.prepend(_all_sup_files + ";;"); +#endif _filter_.append(";;" + m_mapFilters[AVS_OFFICESTUDIO_FILE_UNKNOWN]); } const QString _default_sel_filter = _all_sup_files.isEmpty() ? From a545786af068ec7d728f3321659db8f38a8eee65 Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Wed, 8 Nov 2023 10:55:16 +0200 Subject: [PATCH 3/3] [win-linux] fix bug 51040 --- win-linux/src/components/ctabbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win-linux/src/components/ctabbar.cpp b/win-linux/src/components/ctabbar.cpp index a1f1c4ab1..a54d1ebf6 100644 --- a/win-linux/src/components/ctabbar.cpp +++ b/win-linux/src/components/ctabbar.cpp @@ -1165,7 +1165,7 @@ bool CTabBar::eventFilter(QObject *watched, QEvent *event) } else if (mouse_event->button() == Qt::MiddleButton) { for (int i = 0; i < d->tabList.size(); i++) { - if (d->tabList[i]->close_btn->underMouse()) { + if (d->_tabRect(i).contains(mouse_event->pos())) { emit tabCloseRequested(i); return true; }