1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00

[Win] This fix completes e934af9

This commit is contained in:
S. Razi Alavizadeh 2013-02-15 01:53:28 +03:30
parent c41e17611a
commit c4b98d4a7a
6 changed files with 17 additions and 2 deletions

View File

@ -1579,6 +1579,12 @@ void QupZilla::triggerTabsOnTop(bool enable)
} }
qzSettings->tabsOnTop = enable; qzSettings->tabsOnTop = enable;
#ifdef Q_OS_WIN
if (QtWin::isCompositionEnabled()) {
applyBlurToMainWindow();
}
#endif
} }
void QupZilla::refreshHistory() void QupZilla::refreshHistory()
@ -2339,7 +2345,9 @@ bool QupZilla::nativeEvent(const QByteArray &eventType, void* _message, long* re
void QupZilla::applyBlurToMainWindow(bool force) void QupZilla::applyBlurToMainWindow(bool force)
{ {
if (!force && (m_actionShowFullScreen->isChecked() || !m_usingTransparentBackground)) { if (!force && (m_actionShowFullScreen->isChecked()
|| !m_usingTransparentBackground
|| m_tabWidget->getTabBar()->isChangingTab())) {
return; return;
} }
int topMargin = 0; int topMargin = 0;

View File

@ -50,6 +50,7 @@ RSSNotification::RSSNotification(const QString &title, const QUrl &url, WebView*
, m_url(url) , m_url(url)
, m_view(parent) , m_view(parent)
{ {
setAutoFillBackground(true);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
ui->setupUi(widget()); ui->setupUi(widget());

View File

@ -31,6 +31,7 @@ HTML5PermissionsNotification::HTML5PermissionsNotification(const QString &host,
, m_frame(frame) , m_frame(frame)
, m_feature(feature) , m_feature(feature)
{ {
setAutoFillBackground(true);
ui->setupUi(widget()); ui->setupUi(widget());
ui->close->setIcon(qIconProvider->standardIcon(QStyle::SP_DialogCloseButton)); ui->close->setIcon(qIconProvider->standardIcon(QStyle::SP_DialogCloseButton));

View File

@ -44,6 +44,7 @@ TabBar::TabBar(QupZilla* mainClass, TabWidget* tabWidget)
, m_tabWidget(tabWidget) , m_tabWidget(tabWidget)
, m_tabPreview(new TabPreview(mainClass, tabWidget)) , m_tabPreview(new TabPreview(mainClass, tabWidget))
, m_showTabPreviews(false) , m_showTabPreviews(false)
, m_isChangingTab(false)
, m_clickedTab(0) , m_clickedTab(0)
, m_pinnedTabsCount(0) , m_pinnedTabsCount(0)
, m_normalTabWidth(0) , m_normalTabWidth(0)
@ -399,13 +400,14 @@ void TabBar::currentTabChanged(int index)
if (!validIndex(index)) { if (!validIndex(index)) {
return; return;
} }
m_isChangingTab = true;
hideTabPreview(false); hideTabPreview(false);
showCloseButton(index); showCloseButton(index);
hideCloseButton(m_tabWidget->lastTabIndex()); hideCloseButton(m_tabWidget->lastTabIndex());
m_tabWidget->currentTabChanged(index); m_tabWidget->currentTabChanged(index);
m_isChangingTab = false;
} }
void TabBar::bookmarkTab() void TabBar::bookmarkTab()

View File

@ -42,6 +42,7 @@ public:
int pinnedTabsCount(); int pinnedTabsCount();
int normalTabsCount(); int normalTabsCount();
bool isChangingTab() { return m_isChangingTab; }
void updatePinnedTabCloseButton(int index); void updatePinnedTabCloseButton(int index);
void disconnectObjects(); void disconnectObjects();
@ -105,6 +106,7 @@ private:
QTimer* m_tabPreviewTimer; QTimer* m_tabPreviewTimer;
bool m_showTabPreviews; bool m_showTabPreviews;
bool m_isChangingTab;
int m_clickedTab; int m_clickedTab;
int m_pinnedTabsCount; int m_pinnedTabsCount;

View File

@ -31,6 +31,7 @@ GM_Notification::GM_Notification(GM_Manager* manager, const QString &tmpfileName
, m_tmpFileName(tmpfileName) , m_tmpFileName(tmpfileName)
, m_fileName(fileName) , m_fileName(fileName)
{ {
setAutoFillBackground(true);
ui->setupUi(widget()); ui->setupUi(widget());
ui->close->setIcon(qIconProvider->standardIcon(QStyle::SP_DialogCloseButton)); ui->close->setIcon(qIconProvider->standardIcon(QStyle::SP_DialogCloseButton));