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

[Mac] RSSManager/AdBlockDialog documentMode was disabled and fixed double cursor problem.

This commit is contained in:
S. Razi Alavizadeh 2013-02-21 00:20:07 +03:30
parent 1320a6cf03
commit 72c66cb218
3 changed files with 8 additions and 2 deletions

View File

@ -36,7 +36,9 @@ AdBlockDialog::AdBlockDialog(QWidget* parent)
{ {
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
setupUi(this); setupUi(this);
#ifdef Q_OS_MAC
tabWidget->setDocumentMode(false);
#endif
adblockCheckBox->setChecked(m_manager->isEnabled()); adblockCheckBox->setChecked(m_manager->isEnabled());
QMenu* menu = new QMenu(buttonMenu); QMenu* menu = new QMenu(buttonMenu);

View File

@ -552,6 +552,7 @@ void LocationBar::hideProgress()
void LocationBar::paintEvent(QPaintEvent* event) void LocationBar::paintEvent(QPaintEvent* event)
{ {
#ifndef Q_OS_MAC
if (m_completer.isPopupVisible() && !m_completer.showingMostVisited()) { if (m_completer.isPopupVisible() && !m_completer.showingMostVisited()) {
// We need to draw cursor when popup is visible // We need to draw cursor when popup is visible
// But don't paint it if we are just showing most visited sites // But don't paint it if we are just showing most visited sites
@ -582,6 +583,7 @@ void LocationBar::paintEvent(QPaintEvent* event)
p.fillRect(cursorRect, option.palette.text().color()); p.fillRect(cursorRect, option.palette.text().color());
return; return;
} }
#endif
if (hasFocus() || text().isEmpty() || m_forceLineEditPaintEvent) { if (hasFocus() || text().isEmpty() || m_forceLineEditPaintEvent) {
LineEdit::paintEvent(event); LineEdit::paintEvent(event);

View File

@ -43,7 +43,9 @@ RSSManager::RSSManager(QupZilla* mainClass, QWidget* parent)
, p_QupZilla(mainClass) , p_QupZilla(mainClass)
{ {
ui->setupUi(this); ui->setupUi(this);
#ifdef Q_OS_MAC
ui->tabWidget->setDocumentMode(false);
#endif
ui->tabWidget->setElideMode(Qt::ElideRight); ui->tabWidget->setElideMode(Qt::ElideRight);
m_networkManager = mApp->networkManager(); m_networkManager = mApp->networkManager();