|
 |
d585b42 |
From 1a175067dfeec339ac77cbb12f23abc858f8f4bb Mon Sep 17 00:00:00 2001
|
|
|
d585b42 |
From: Jan Grulich <jgrulich@redhat.com>
|
|
|
d585b42 |
Date: Thu, 30 Jun 2016 11:28:00 +0200
|
|
|
d585b42 |
Subject: Attempt to fix missing menubar issue for QtCreator
|
|
|
d585b42 |
|
|
|
d585b42 |
It shouldn't be necessary to set MenuBar size, as height should be already set by MenuBarItem and setting
|
|
|
d585b42 |
width to 30px doesn't make much sense as it will be always wider
|
|
|
d585b42 |
|
|
|
9d7bdee |
diff --git a/src/style/adwaita.cpp b/src/style/adwaita.cpp
|
|
|
d585b42 |
index f751d50..9c719a0 100644
|
|
|
9d7bdee |
--- a/src/style/adwaita.cpp
|
|
|
9d7bdee |
+++ b/src/style/adwaita.cpp
|
|
|
d585b42 |
@@ -1670,14 +1670,20 @@ QSize Adwaita::sizeFromContents(QStyle::ContentsType ct, const QStyleOption* opt
|
|
|
d585b42 |
}
|
|
|
d585b42 |
case CT_MenuBarItem: {
|
|
|
d585b42 |
//const QStyleOptionMenuItem *miopt = qstyleoption_cast<const QStyleOptionMenuItem*>(opt);
|
|
|
d585b42 |
- return QSize(QCommonStyle::sizeFromContents(ct, opt, contentsSize, widget).width() + 16, 30);
|
|
|
d585b42 |
+ return QCommonStyle::sizeFromContents(ct, opt, contentsSize, widget) + QSize(16, 8);
|
|
|
d585b42 |
}
|
|
|
9d7bdee |
case CT_MenuItem: {
|
|
|
9d7bdee |
return QCommonStyle::sizeFromContents(ct, opt, contentsSize, widget) + QSize(24, 0);
|
|
|
9d7bdee |
}
|
|
|
9d7bdee |
+
|
|
|
9d7bdee |
+ // FIXME: is it necessary to set MenuBar size? Height should be already set by MenuBarItem to 30px and setting
|
|
|
9d7bdee |
+ // width to 30px doesn't really make sense to me. Resolves: https://github.com/MartinBriza/adwaita-qt/issues/34
|
|
|
9d7bdee |
+
|
|
|
9d7bdee |
+ /*
|
|
|
9d7bdee |
case CT_MenuBar: {
|
|
|
9d7bdee |
return QSize(30, 30);
|
|
|
9d7bdee |
}
|
|
|
9d7bdee |
+ */
|
|
|
9d7bdee |
case CT_ComboBox: {
|
|
|
9d7bdee |
return QCommonStyle::sizeFromContents(ct, opt, contentsSize, widget) + QSize(4, 6);
|
|
|
9d7bdee |
}
|