Commit b641e066 authored by Ahmad Samir's avatar Ahmad Samir Committed by Kurt Hindenburg
Browse files

Reimplement KMainWindow::applyMainWindowSettings() to override menubar state

parent 3177c9ef
......@@ -114,6 +114,15 @@ MainWindow::MainWindow()
KCrash::initialize();
}
void MainWindow::applyMainWindowSettings(const KConfigGroup &config)
{
KMainWindow::applyMainWindowSettings(config);
// Override the menubar state from the config file
menuBar()->setVisible(_menuBarInitialVisibility);
_toggleMenuBarAction->setChecked(_menuBarInitialVisibility);
}
bool MainWindow::wasWindowGeometrySaved() const
{
KSharedConfigPtr konsoleConfig = KSharedConfig::openConfig(QStringLiteral("konsolerc"));
......@@ -880,12 +889,6 @@ void MainWindow::showEvent(QShowEvent *event)
// Apply this code on first show only
if (_firstShowEvent) {
_firstShowEvent = false;
// the initial visibility of menubar should be applied at this last
// moment. Otherwise, the initial visibility will be determined by
// what KMainWindow has automatically stored in konsolerc, but not by
// what users has explicitly configured .
menuBar()->setVisible(_menuBarInitialVisibility);
_toggleMenuBarAction->setChecked(_menuBarInitialVisibility);
if (!KonsoleSettings::saveGeometryOnExit() || !wasWindowGeometrySaved()) {
// Delay resizing to here, so that the other parts of the UI
......
......@@ -172,6 +172,8 @@ public Q_SLOTS:
void viewFullScreen(bool fullScreen);
private:
void applyMainWindowSettings(const KConfigGroup &config) override;
/**
* Returns true if the window geometry was previously saved to the
* config file, false otherwise.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment