Blame qt-creator-menubar-fix.patch
|
Jan Grulich |
9d7bde |
diff --git a/src/style/adwaita.cpp b/src/style/adwaita.cpp
|
|
Jan Grulich |
9d7bde |
index f751d50..700bd97 100644
|
|
Jan Grulich |
9d7bde |
--- a/src/style/adwaita.cpp
|
|
Jan Grulich |
9d7bde |
+++ b/src/style/adwaita.cpp
|
|
Jan Grulich |
9d7bde |
@@ -1675,9 +1675,15 @@ QSize Adwaita::sizeFromContents(QStyle::ContentsType ct, const QStyleOption* opt
|
|
Jan Grulich |
9d7bde |
case CT_MenuItem: {
|
|
Jan Grulich |
9d7bde |
return QCommonStyle::sizeFromContents(ct, opt, contentsSize, widget) + QSize(24, 0);
|
|
Jan Grulich |
9d7bde |
}
|
|
Jan Grulich |
9d7bde |
+
|
|
Jan Grulich |
9d7bde |
+ // FIXME: is it necessary to set MenuBar size? Height should be already set by MenuBarItem to 30px and setting
|
|
Jan Grulich |
9d7bde |
+ // width to 30px doesn't really make sense to me. Resolves: https://github.com/MartinBriza/adwaita-qt/issues/34
|
|
Jan Grulich |
9d7bde |
+
|
|
Jan Grulich |
9d7bde |
+ /*
|
|
Jan Grulich |
9d7bde |
case CT_MenuBar: {
|
|
Jan Grulich |
9d7bde |
return QSize(30, 30);
|
|
Jan Grulich |
9d7bde |
}
|
|
Jan Grulich |
9d7bde |
+ */
|
|
Jan Grulich |
9d7bde |
case CT_ComboBox: {
|
|
Jan Grulich |
9d7bde |
return QCommonStyle::sizeFromContents(ct, opt, contentsSize, widget) + QSize(4, 6);
|
|
Jan Grulich |
9d7bde |
}
|