1
0
Fork 0

Fix transparent favourite toolbar hovering over the File menu

This commit is contained in:
torusrxxx 2020-12-24 18:55:19 +08:00
parent 9fe6a9c164
commit 558370d1ba
No known key found for this signature in database
GPG Key ID: A795C73A0F1CFADD
1 changed files with 6 additions and 9 deletions

View File

@ -728,6 +728,10 @@ void MainWindow::clearTabWidget()
void MainWindow::saveWindowSettings() void MainWindow::saveWindowSettings()
{ {
// Save favourite toolbar
BridgeSettingSetUint("Main Window Settings", "FavToolbarVisible", mFavouriteToolbar->isVisible() ? 1 : 0);
removeToolBar(mFavouriteToolbar); //Remove it before saving main window settings, otherwise it crashes
// Main Window settings // Main Window settings
BridgeSettingSet("Main Window Settings", "Geometry", saveGeometry().toBase64().data()); BridgeSettingSet("Main Window Settings", "Geometry", saveGeometry().toBase64().data());
BridgeSettingSet("Main Window Settings", "State", saveState().toBase64().data()); BridgeSettingSet("Main Window Settings", "State", saveState().toBase64().data());
@ -747,11 +751,6 @@ void MainWindow::saveWindowSettings()
mWidgetList[i].widget->parentWidget()->saveGeometry().toBase64().data()); mWidgetList[i].widget->parentWidget()->saveGeometry().toBase64().data());
} }
// Save favourite toolbar
BridgeSettingSetUint("Main Window Settings", "FavToolbarPositionX", mFavouriteToolbar->x());
BridgeSettingSetUint("Main Window Settings", "FavToolbarPositionY", mFavouriteToolbar->y());
BridgeSettingSetUint("Main Window Settings", "FavToolbarVisible", mFavouriteToolbar->isVisible() ? 1 : 0);
mCpuWidget->saveWindowSettings(); mCpuWidget->saveWindowSettings();
mSymbolView->saveWindowSettings(); mSymbolView->saveWindowSettings();
} }
@ -797,11 +796,9 @@ void MainWindow::loadWindowSettings()
} }
// Load favourite toolbar // Load favourite toolbar
duint posx = 0, posy = 0, isVisible = 0; duint isVisible = 0;
BridgeSettingGetUint("Main Window Settings", "FavToolbarPositionX", &posx);
BridgeSettingGetUint("Main Window Settings", "FavToolbarPositionY", &posy);
BridgeSettingGetUint("Main Window Settings", "FavToolbarVisible", &isVisible); BridgeSettingGetUint("Main Window Settings", "FavToolbarVisible", &isVisible);
mFavouriteToolbar->move(posx, posy); addToolBar(mFavouriteToolbar);
mFavouriteToolbar->setVisible(isVisible == 1); mFavouriteToolbar->setVisible(isVisible == 1);
mCpuWidget->loadWindowSettings(); mCpuWidget->loadWindowSettings();