luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Never export the menu bar through DBus, it crashes on Mate.

Browse source 
[GB.QT4]
* BUG: Never export the menu bar through DBus, it crashes on Mate.

[GB.QT5]
* BUG: Never export the menu bar through DBus, it crashes on Mate.
* BUG: Better support of popups when run on Wayland.
This commit is contained in:
gambas 2020-08-21 01:31:19 +02:00
parent 362e6ce64d
commit e2eabcdb29
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gb.qt4/src/CMenu.cpp
View file

@ -27,6 +27,7 @@
#include <QMenu> #include <QMenu>
#include <QKeyEvent> #include <QKeyEvent>
#include <QActionGroup> #include <QActionGroup>
#include <QWindow>
#include "gambas.h" #include "gambas.h"
#include "gb_common.h" #include "gb_common.h"
@ -391,11 +392,12 @@ BEGIN_METHOD(Menu_new, GB_OBJECT parent; GB_BOOLEAN hidden)
if (!menu->menu) if (!menu->menu)
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) && QT_VERSION < QT_VERSION_CHECK(5,5,0) #if QT_VERSION >= QT_VERSION_CHECK(5,0,0) && QT_VERSION < QT_VERSION_CHECK(5,5,0)
menu->menu = new MyMenu(); menu->menu = new MyMenu();
#else #else
menu->menu = new QMenu(); menu->menu = new QMenu();
#endif #endif
menu->menu->setSeparatorsCollapsible(true); menu->menu->setSeparatorsCollapsible(true);
((QAction *)(menu->widget.widget))->setMenu(menu->menu); ((QAction *)(menu->widget.widget))->setMenu(menu->menu);
@ -422,6 +424,7 @@ BEGIN_METHOD(Menu_new, GB_OBJECT parent; GB_BOOLEAN hidden)
if (!menuBar) if (!menuBar)
{ {
menuBar = new QMenuBar(topLevel); menuBar = new QMenuBar(topLevel);
menuBar->setNativeMenuBar(false);
//menuBar->setAutoFillBackground(true); //menuBar->setAutoFillBackground(true);
window->menuBar = menuBar; window->menuBar = menuBar;
} }
@ -1030,6 +1033,11 @@ void CMenu::slotShown(void)
GET_MENU_SENDER(menu); GET_MENU_SENDER(menu);
HANDLE_PROXY(menu); HANDLE_PROXY(menu);
#ifdef QT5
if (menu->menu->windowHandle())
menu->menu->windowHandle()->setTransientParent(menu->toplevel->windowHandle());
#endif
GB.Ref(menu); GB.Ref(menu);
menu->opened = TRUE; menu->opened = TRUE;