Merge pull request #1039 from ONLYOFFICE/patch/develop_r3

Patch/develop
ONLYOFFICE · Nov 13, 2023 · f654d75 · f654d75
2 parents 3c35e3d + a545786
commit f654d75
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git 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
                 }
             }
 

diff --git 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() ?

diff --git 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;
                     }