anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix disappearing menus syndrome on Qt/Mac

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8812 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2004-06-09 14:10:27 +00:00
parent 5af062b550
commit 59e677aa48
3 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,8 @@
2004-06-08 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* QLMenubar.C (QLMenubar): use QLMenubar::menuBar().
(menuBar): new method; returns the menu bar that LyX should use.
2004-06-02 Angus Leeming <leeming@lyx.org>
* Q[a-zA-Z]*DialogBase.C: reverse yesterday's patch, as discussed

37
src/frontends/qt2/QLMenubar.C
View File

@ -31,12 +31,15 @@ namespace frontend {
QLMenubar::QLMenubar(LyXView * view, MenuBackend const & mbe)
: owner_(static_cast<QtView*>(view)), menubackend_(mbe)
#ifdef Q_WS_MACX
, menubar_(new QMenuBar)
#endif
{
Menu::const_iterator m = mbe.getMenubar().begin();
Menu::const_iterator end = mbe.getMenubar().end();
for (; m != end; ++m) {
pair<int, QLPopupMenu *> menu =
createMenu(owner_->menuBar(), &(*m), this, true);
createMenu(menuBar(), &(*m), this, true);
name_map_[m->submenuname()] = menu.second;
#ifdef Q_WS_MACX
/* The qt/mac menu code has a very silly hack that
@ -52,7 +55,6 @@ QLMenubar::QLMenubar(LyXView * view, MenuBackend const & mbe)
}
}
void QLMenubar::openByName(string const & name)
{
NameMap::const_iterator const cit = name_map_.find(name);
@ -79,5 +81,36 @@ MenuBackend const & QLMenubar::backend()
return menubackend_;
}
/*
Here is what the Qt documentation says about how a menubar is chosen:
1) If the window has a QMenuBar then it is used. 2) If the window
is a modal then its menubar is used. If no menubar is specified
then a default menubar is used (as documented below) 3) If the
window has no parent then the default menubar is used (as
documented below).
The above 3 steps are applied all the way up the parent window
chain until one of the above are satisifed. If all else fails a
default menubar will be created, the default menubar on Qt/Mac is
an empty menubar, however you can create a different default
menubar by creating a parentless QMenuBar, the first one created
will thus be designated the default menubar, and will be used
whenever a default menubar is needed.
Thus, for Qt/Mac, we add the menus to a free standing menubar, so
that this menubar will be used also when one of LyX' dialogs has
focus. (JMarc)
*/
QMenuBar * QLMenubar::menuBar() const
{
#ifdef Q_WS_MAC
return menubar_.get();
#else
return owner_->menuBar();
#endif
}
} // namespace frontend
} // namespace lyx

8
src/frontends/qt2/QLMenubar.h
View File

@ -19,6 +19,7 @@
class LyXView;
class MenuBackend;
class QMenuBar;
namespace lyx {
namespace frontend {
@ -52,6 +53,13 @@ private:
/// name to menu for openByName
NameMap name_map_;
/// The QMenuBar used by LyX
QMenuBar * menuBar() const;
#ifdef Q_WS_MACX
boost::scoped_ptr<QMenuBar> menubar_;
#endif
};
} // namespace frontend