1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 02:52:12 +01:00

Don't hide supermenu button in fullscreen

Also make the supermenu button as last button in toolbar
This commit is contained in:
David Rosca 2016-08-15 13:58:25 +02:00
parent 9ae6c12a3c
commit cce94944f7
2 changed files with 2 additions and 3 deletions

View File

@ -1075,7 +1075,6 @@ bool BrowserWindow::event(QEvent* event)
statusBar()->hide(); statusBar()->hide();
m_navigationContainer->hide(); m_navigationContainer->hide();
m_navigationToolbar->setSuperMenuVisible(false);
m_navigationToolbar->buttonExitFullscreen()->setVisible(true); m_navigationToolbar->buttonExitFullscreen()->setVisible(true);
} }
else if (ev->oldState() & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) { else if (ev->oldState() & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) {

View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - WebKit based browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -133,8 +133,8 @@ NavigationBar::NavigationBar(BrowserWindow* window)
m_layout->addWidget(m_buttonHome); m_layout->addWidget(m_buttonHome);
m_layout->addWidget(m_buttonAddTab); m_layout->addWidget(m_buttonAddTab);
m_layout->addWidget(m_navigationSplitter); m_layout->addWidget(m_navigationSplitter);
m_layout->addWidget(m_supMenu);
m_layout->addWidget(m_exitFullscreen); m_layout->addWidget(m_exitFullscreen);
m_layout->addWidget(m_supMenu);
setContextMenuPolicy(Qt::CustomContextMenu); setContextMenuPolicy(Qt::CustomContextMenu);
connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequested(QPoint))); connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequested(QPoint)));