Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

[Windows] Fixed compile issues after aa248893 and 7f3d8ee7

Browse Source
This commit is contained in:
S. Razi Alavizadeh 2014-04-06 17:38:36 +04:30
parent 463fa96e04
commit 39c9fec3dd
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,7 +430,7 @@ void BrowserWindow::loadSettings()
if (m_useTransparentBackground && !makeTransparent) { if (m_useTransparentBackground && !makeTransparent) {
QtWin::extendFrameIntoClientArea(this, 0, 0, 0, 0); QtWin::extendFrameIntoClientArea(this, 0, 0, 0, 0);
QtWin::enableBlurBehindWindow(this, false); QtWin::enableBlurBehindWindow(this, false);
m_tabWidget->getTabBar()->enableBluredBackground(false); m_tabWidget->tabBar()->enableBluredBackground(false);
m_useTransparentBackground = false; m_useTransparentBackground = false;
} }
#endif #endif
@ -459,13 +459,13 @@ void BrowserWindow::loadSettings()
m_useTransparentBackground = true; m_useTransparentBackground = true;
if (!isFullScreen()) { if (!isFullScreen()) {
m_tabWidget->getTabBar()->enableBluredBackground(true); m_tabWidget->tabBar()->enableBluredBackground(true);
QtWin::extendFrameIntoClientArea(this); QtWin::extendFrameIntoClientArea(this);
} }
// Install event filters // Install event filters
menuBar()->installEventFilter(this); menuBar()->installEventFilter(this);
m_tabWidget->getTabBar()->installEventFilter(this); m_tabWidget->tabBar()->installEventFilter(this);
m_navigationToolbar->installEventFilter(this); m_navigationToolbar->installEventFilter(this);
m_bookmarksToolbar->installEventFilter(this); m_bookmarksToolbar->installEventFilter(this);
statusBar()->installEventFilter(this); statusBar()->installEventFilter(this);
@ -1077,7 +1077,7 @@ bool BrowserWindow::event(QEvent* event)
m_navigationToolbar->buttonExitFullscreen()->setVisible(true); m_navigationToolbar->buttonExitFullscreen()->setVisible(true);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
if (m_useTransparentBackground) { if (m_useTransparentBackground) {
m_tabWidget->getTabBar()->enableBluredBackground(false); m_tabWidget->tabBar()->enableBluredBackground(false);
QtWin::extendFrameIntoClientArea(this, 0, 0, 0 , 0); QtWin::extendFrameIntoClientArea(this, 0, 0, 0 , 0);
QtWin::enableBlurBehindWindow(this, false); QtWin::enableBlurBehindWindow(this, false);
} }
@ -1095,7 +1095,7 @@ bool BrowserWindow::event(QEvent* event)
m_navigationToolbar->buttonExitFullscreen()->setVisible(false); m_navigationToolbar->buttonExitFullscreen()->setVisible(false);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
if (m_useTransparentBackground) { if (m_useTransparentBackground) {
m_tabWidget->getTabBar()->enableBluredBackground(true); m_tabWidget->tabBar()->enableBluredBackground(true);
applyBlurToMainWindow(true); applyBlurToMainWindow(true);
} }
#endif #endif
@ -1553,7 +1553,7 @@ void BrowserWindow::applyBlurToMainWindow(bool force)
topMargin += menuBar()->isVisible() ? menuBar()->height() : 0; topMargin += menuBar()->isVisible() ? menuBar()->height() : 0;
topMargin += m_navigationToolbar->isVisible() ? m_navigationToolbar->height() : 0; topMargin += m_navigationToolbar->isVisible() ? m_navigationToolbar->height() : 0;
topMargin += m_bookmarksToolbar->isVisible() ? m_bookmarksToolbar->height() : 0; topMargin += m_bookmarksToolbar->isVisible() ? m_bookmarksToolbar->height() : 0;
topMargin += m_tabWidget->getTabBar()->height(); topMargin += m_tabWidget->tabBar()->height();
SearchToolBar* search = searchToolBar(); SearchToolBar* search = searchToolBar();
if (search) { if (search) {

1
src/main/main.pro
View File

@ -32,6 +32,5 @@ os2:RC_FILE = appicon_os2.rc
win32:RC_FILE = appicon.rc win32:RC_FILE = appicon.rc
include(../install.pri) include(../install.pri)
include(../lib/3rdparty/qtsingleapplication/qtsingleapplication.pri)
unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}\\$\$ORIGIN unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}\\$\$ORIGIN