From 1a175067dfeec339ac77cbb12f23abc858f8f4bb Mon Sep 17 00:00:00 2001

From: Jan Grulich <jgrulich@redhat.com>

Date: Thu, 30 Jun 2016 11:28:00 +0200

Subject: Attempt to fix missing menubar issue for QtCreator

It shouldn't be necessary to set MenuBar size, as height should be already set by MenuBarItem and setting

width to 30px doesn't make much sense as it will be always wider

diff --git a/src/style/adwaita.cpp b/src/style/adwaita.cpp

index f751d50..9c719a0 100644

--- a/src/style/adwaita.cpp

+++ b/src/style/adwaita.cpp

@@ -1670,14 +1670,20 @@ QSize Adwaita::sizeFromContents(QStyle::ContentsType ct, const QStyleOption* opt

         }

         case CT_MenuBarItem: {

             //const QStyleOptionMenuItem *miopt = qstyleoption_cast<const QStyleOptionMenuItem*>(opt);

-            return QSize(QCommonStyle::sizeFromContents(ct, opt, contentsSize, widget).width() + 16, 30);

+            return QCommonStyle::sizeFromContents(ct, opt, contentsSize, widget) + QSize(16, 8);

         }

         case CT_MenuItem: {

             return QCommonStyle::sizeFromContents(ct, opt, contentsSize, widget) + QSize(24, 0);

         }

+

+        // FIXME: is it necessary to set MenuBar size? Height should be already set by MenuBarItem to 30px and setting

+        // width to 30px doesn't really make sense to me. Resolves: https://github.com/MartinBriza/adwaita-qt/issues/34

+

+        /*

         case CT_MenuBar: {

             return QSize(30, 30);

         }

+        */

         case CT_ComboBox: {

             return QCommonStyle::sizeFromContents(ct, opt, contentsSize, widget) + QSize(4, 6);

         }