pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #937 from ONLYOFFICE/fix/tab_switching

Browse Source 
Fix switching tabs with Ctrl+Tab shortcut
This commit is contained in:
Maxim Kadushkin
2023-08-25 16:56:34 +03:00
committed by GitHub
parent 179d936d22 8819f368af
commit a541d0afb5
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
win-linux/src/components/asctabwidget.cpp
View File

@ -142,6 +142,11 @@ CAscTabWidget::CAscTabWidget(QWidget *parent, CTabBar *_pBar)
static int _dropedindex = -1;
QObject::connect(this, &CAscTabWidget::currentChanged, this, [=](int index) {
QTimer::singleShot(0, this, [=]() {
if (index != -1 && index != m_pBar->currentIndex()) {
m_pBar->blockSignals(true);
m_pBar->setCurrentIndex(index);
m_pBar->blockSignals(false);
}
updateIcons();
});
setFocusedView();
@ -171,7 +176,9 @@ CAscTabWidget::CAscTabWidget(QWidget *parent, CTabBar *_pBar)
}
});
auto turnOffAltHints = [=](int old_index, int index) {
this->setCurrentIndex(index);
QTimer::singleShot(0, this, [=]() {
setCurrentIndex(index);
});
if (old_index > -1)
AscAppManager::sendCommandTo(panel(old_index)->cef(), L"althints:show", L"false");
};

2
win-linux/src/windows/cmainwindow.cpp
View File

@ -521,11 +521,11 @@ void CMainWindow::onEditorAllowedClose(int uid)
} else {
int _index = m_pTabs->tabIndexByView(uid);
if ( !(_index < 0) ) {
m_pTabs->tabBar()->removeTab(_index);
QWidget * _view = m_pTabs->widget(_index);
m_pTabs->removeWidget(_view);
_view->deleteLater();
m_pTabs->tabBar()->removeTab(_index);
//m_pTabs->adjustTabsSize();
onTabChanged(m_pTabs->currentIndex());