luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bugfix: menu system wasn't working properly with menu tool buttons

This commit is contained in:
Matthias Koefferlein 2022-08-16 23:00:31 +02:00
parent 9ee5730b60
commit 5b40d86527
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/laybasic/laybasic/layAbstractMenu.cc
View File

@ -622,21 +622,6 @@ Action::menu () const
return mp_menu; return mp_menu;
} }
static void
configure_action (QAction *target, QAction *src)
{
target->setShortcut (src->shortcut ());
target->setToolTip (src->toolTip ());
target->setCheckable (src->isCheckable ());
target->setChecked (src->isChecked ());
target->setEnabled (src->isEnabled ());
target->setIcon (src->icon ());
target->setIconText (src->iconText ());
target->setSeparator (src->isSeparator ());
target->setText (src->text ());
target->setVisible (src->isVisible ());
}
void void
Action::set_menu (QMenu *menu, bool owned) Action::set_menu (QMenu *menu, bool owned)
{ {
@ -647,7 +632,7 @@ Action::set_menu (QMenu *menu, bool owned)
if (mp_menu && ! menu) { if (mp_menu && ! menu) {
QAction *new_action = new ActionObject (0); QAction *new_action = new ActionObject (0);
configure_action (new_action, mp_action); configure_action (new_action);
if (m_owned) { if (m_owned) {
delete mp_menu; delete mp_menu;
@ -659,7 +644,7 @@ Action::set_menu (QMenu *menu, bool owned)
} else if (mp_menu && menu) { } else if (mp_menu && menu) {
configure_action (menu->menuAction (), mp_action); configure_action (menu->menuAction ());
if (m_owned) { if (m_owned) {
delete mp_menu; delete mp_menu;
@ -671,7 +656,7 @@ Action::set_menu (QMenu *menu, bool owned)
} else if (! mp_menu && menu) { } else if (! mp_menu && menu) {
configure_action (menu->menuAction (), mp_action); configure_action (menu->menuAction ());
if (m_owned) { if (m_owned) {
delete mp_action; delete mp_action;
@ -718,6 +703,31 @@ Action::sync_qaction ()
#endif #endif
} }
#if defined(HAVE_QT)
void
Action::configure_action (QAction *target) const
{
target->setVisible (is_effective_visible ());
target->setShortcut (get_key_sequence ());
target->setEnabled (is_effective_enabled ());
target->setToolTip (tl::to_qstring (get_tool_tip ()));
target->setCheckable (is_checkable ());
target->setChecked (is_checked ());
target->setIconText (tl::to_qstring (get_icon_text ()));
target->setSeparator (is_separator ());
target->setText (tl::to_qstring (get_title ()));
if (qaction ()) {
target->setIcon (qaction ()->icon ());
target->setObjectName (qaction ()->objectName ());
} else if (m_icon.empty ()) {
target->setIcon (QIcon ());
} else {
target->setIcon (QIcon (tl::to_qstring (m_icon)));
}
}
#endif
void void
Action::set_visible (bool v) Action::set_visible (bool v)
{ {

1
src/laybasic/laybasic/layAbstractMenu.h
View File

@ -437,6 +437,7 @@ private:
#if defined(HAVE_QT) #if defined(HAVE_QT)
QKeySequence get_key_sequence () const; QKeySequence get_key_sequence () const;
QKeySequence get_key_sequence_for (const std::string &sc) const; QKeySequence get_key_sequence_for (const std::string &sc) const;
void configure_action (QAction *target) const;
#endif #endif
void configure_from_title (const std::string &s); void configure_from_title (const std::string &s);