Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

Merge branch 'Falkon/3.0'

Browse Source
This commit is contained in:
David Rosca 2018-03-09 22:53:16 +01:00
commit a5223ddb0c
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/app/browserwindow.cpp
View File

@ -610,15 +610,17 @@ void BrowserWindow::loadSettings()
}
settings.endGroup();
m_statusBarVisible = showStatusBar;
statusBar()->setVisible(!isFullScreen() && showStatusBar);
m_bookmarksToolbar->setVisible(showBookmarksToolbar);
m_navigationToolbar->setVisible(showNavigationToolbar);
#ifndef Q_OS_MACOS
m_menuBarVisible = showMenuBar;
menuBar()->setVisible(!isFullScreen() && showMenuBar);
#endif
m_navigationToolbar->setSuperMenuVisible(!showMenuBar);
m_navigationToolbar->setSuperMenuVisible(isFullScreen() || !showMenuBar);
}
void BrowserWindow::goForward()
@ -1226,6 +1228,9 @@ bool BrowserWindow::event(QEvent *event)
m_navigationContainer->hide();
m_navigationToolbar->enterFullScreen();
// Show main menu button since menubar is hidden
m_navigationToolbar->setSuperMenuVisible(true);
}
else if (e->oldState() & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) {
// Leave fullscreen

1
src/lib/app/mainapplication.cpp
View File

@ -123,7 +123,6 @@ MainApplication::MainApplication(int &argc, char** argv)
// Set fallback icon theme (eg. on Windows/Mac)
if (QIcon::fromTheme(QSL("view-refresh")).isNull()) {
QIcon::setThemeSearchPaths(QStringList() << QL1S(":/breeze-fallback"));
QIcon::setThemeName(QSL("breeze-fallback"));
}

2
src/lib/data/breeze-fallback.qrc
View File

@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/breeze-fallback">
<qresource prefix="/icons">
<file>breeze-fallback/index.theme</file>
<file>breeze-fallback/16x16/bookmark-new.svg</file>
<file>breeze-fallback/16x16/bookmarks-organize.svg</file>