From b04ac61ef00b001a23dfed9ff7bbf6162291b1e4 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Thu, 29 Jan 2009 15:31:02 +0100 Subject: [PATCH] Fixes: Fix line edit focus on MacStyle Task: 242757 RevBy: twschulz Details: Mac style reimplements QStyle::event, hence we need to pass it on. --- src/plugins/coreplugin/manhattanstyle.cpp | 8 ++++++++ src/plugins/coreplugin/manhattanstyle.h | 3 +++ 2 files changed, 11 insertions(+) diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index 72b86d85d7c..c61dbbbe3e1 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -1054,3 +1054,11 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti break; } } + +// Mac style reimplements this to control the +// focus widget among other things +bool ManhattanStyle::event(QEvent *e) +{ + Q_ASSERT(d->style); + return d->style->event(e); +} diff --git a/src/plugins/coreplugin/manhattanstyle.h b/src/plugins/coreplugin/manhattanstyle.h index 1f61b931e9d..5dd832ffdf8 100644 --- a/src/plugins/coreplugin/manhattanstyle.h +++ b/src/plugins/coreplugin/manhattanstyle.h @@ -78,6 +78,9 @@ public: void unpolish(QWidget *widget); void unpolish(QApplication *app); +protected: + bool event(QEvent *e); + protected Q_SLOTS: QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const; int layoutSpacingImplementation(QSizePolicy::ControlType control1,