Ref T30, use font shortcuts with dock widget

(instead of view)
This commit is contained in:
Klaus Basan
2017-07-15 03:24:17 +02:00
committed by Mathew Sutcliffe
parent 4acf496aa4
commit c39b8cd7fd
3 changed files with 14 additions and 2 deletions

View File

@@ -129,7 +129,7 @@ namespace BlackGui
copy->setObjectName("Copy rows for " + this->objectName());
// Font menus
m_fontMenu = new CFontMenu(this, true);
// m_fontMenu = new CFontMenu(this, true);
}
bool CViewBaseNonTemplate::setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget)
@@ -356,7 +356,7 @@ namespace BlackGui
if (this->m_menus.testFlag(MenuCopy)) { menuActions.addActions(this->initMenuActions(MenuCopy)); }
if (this->m_menus.testFlag(MenuCut)) { menuActions.addActions(this->initMenuActions(MenuCut)); }
if (this->m_menus.testFlag(MenuPaste)) { menuActions.addActions(this->initMenuActions(MenuPaste)); }
if (this->m_menus.testFlag(MenuFont))
if (this->m_menus.testFlag(MenuFont) && m_fontMenu)
{
menuActions.addActions(m_fontMenu->getActions(), CMenuAction::pathFont());
}