diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2012-10-17 15:20:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-18 17:22:49 +0200 |
| commit | a2e4b7a92fad04fc6c73a71ede003ccbdf7b5305 (patch) | |
| tree | 6d880b5f80429344da9413ff39929bfee2c45f57 /src/widgets/styles/qgtkstyle_p.h | |
| parent | 92e4ec7a146660362f365d8a54e0f017c8f48bd9 (diff) | |
Remove dependency on QWindowsStyle in QGtkStyle
Now that we no longer re-use the animation code in gtk,
it is time to remove this strange dependency.
Change-Id: Ib672a9b110dfba08d79b8654e572994007675957
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/widgets/styles/qgtkstyle_p.h')
| -rw-r--r-- | src/widgets/styles/qgtkstyle_p.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/widgets/styles/qgtkstyle_p.h b/src/widgets/styles/qgtkstyle_p.h index 009d49ecbe..71c70c41f1 100644 --- a/src/widgets/styles/qgtkstyle_p.h +++ b/src/widgets/styles/qgtkstyle_p.h @@ -63,7 +63,7 @@ #include <QtWidgets/QFileDialog> #include <QtWidgets/QGtkStyle> -#include <private/qwindowsstyle_p.h> +#include <private/qcommonstyle_p.h> #undef signals // Collides with GTK symbols #include <gtk/gtk.h> @@ -317,7 +317,7 @@ typedef char* (*Ptr_gnome_icon_lookup_sync) ( GnomeIconLookupFlags flags, GnomeIconLookupResultFlags *result); -class QGtkStylePrivate : public QWindowsStylePrivate +class QGtkStylePrivate : public QCommonStylePrivate { Q_DECLARE_PUBLIC(QGtkStyle) public: @@ -522,6 +522,15 @@ protected: virtual void init(); + enum { + menuItemFrame = 2, // menu item frame width + menuItemHMargin = 3, // menu item hor text margin + menuArrowHMargin = 6, // menu arrow horizontal margin + menuItemVMargin = 2, // menu item ver text margin + menuRightBorder = 15, // right border on menus + menuCheckMarkWidth = 12 // checkmarks width on menus + }; + private: static QList<QGtkStylePrivate *> instances; static WidgetMap *widgetMap; |