Palette Gizmo Button
This commit is contained in:
parent
30a1d735ce
commit
fac71c59d7
2 changed files with 16 additions and 4 deletions
|
@ -393,6 +393,10 @@ void PaletteViewer::createPaletteToolBar() {
|
||||||
m_paletteToolBar->setStyleSheet("QToolBar{spacing:3px;}");
|
m_paletteToolBar->setStyleSheet("QToolBar{spacing:3px;}");
|
||||||
m_paletteToolBar->addWidget(m_freezePaletteToolButton);
|
m_paletteToolBar->addWidget(m_freezePaletteToolButton);
|
||||||
|
|
||||||
|
m_paletteToolBar->addSeparator();
|
||||||
|
CommandManager *cmd = CommandManager::instance();
|
||||||
|
QAction *gizmo = cmd->getAction("MI_OpenPltGizmo");
|
||||||
|
m_paletteToolBar->addAction(gizmo);
|
||||||
} else if (m_viewType == STUDIO_PALETTE) {
|
} else if (m_viewType == STUDIO_PALETTE) {
|
||||||
QToolButton *toolButton = new QToolButton(this);
|
QToolButton *toolButton = new QToolButton(this);
|
||||||
toolButton->setPopupMode(QToolButton::InstantPopup);
|
toolButton->setPopupMode(QToolButton::InstantPopup);
|
||||||
|
|
|
@ -726,12 +726,16 @@ void PageViewer::paintEvent(QPaintEvent *e) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// draw frame if the style is selected or current
|
// draw frame if the style is selected or current
|
||||||
if (m_styleSelection->isSelected(m_page->getIndex(), i) ||
|
if (m_styleSelection->isSelected(m_page->getIndex(), i)) {
|
||||||
currentStyleIndex == styleIndex) {
|
|
||||||
QRect itemRect = getItemRect(i).adjusted(0, -1, 0, 1);
|
QRect itemRect = getItemRect(i).adjusted(0, -1, 0, 1);
|
||||||
p.setPen(Qt::NoPen);
|
p.setPen(Qt::NoPen);
|
||||||
p.setBrush(getSelectedBorderColor());
|
p.setBrush(getSelectedBorderColor());
|
||||||
p.drawRoundRect(itemRect, 7, 25);
|
p.drawRoundRect(itemRect, 7, 25);
|
||||||
|
} else if (currentStyleIndex == styleIndex) {
|
||||||
|
QRect itemRect = getItemRect(i).adjusted(1, 0, -1, 0);
|
||||||
|
p.setPen(Qt::NoPen);
|
||||||
|
p.setBrush(getSelectedBorderColor());
|
||||||
|
p.drawRoundRect(itemRect, 7, 25);
|
||||||
}
|
}
|
||||||
// paint style
|
// paint style
|
||||||
QRect chipRect = getItemRect(i).adjusted(4, 4, -5, -5);
|
QRect chipRect = getItemRect(i).adjusted(4, 4, -5, -5);
|
||||||
|
@ -1172,8 +1176,12 @@ void PageViewer::contextMenuEvent(QContextMenuEvent *event) {
|
||||||
menu.addAction(clearAct);
|
menu.addAction(clearAct);
|
||||||
|
|
||||||
menu.addSeparator();
|
menu.addSeparator();
|
||||||
|
// currently palette gizmo can only change colors from the current level
|
||||||
|
// palette due to the way modifyColor works.
|
||||||
|
if (m_viewType == LEVEL_PALETTE) {
|
||||||
QAction *openPltGizmoAct = cmd->getAction("MI_OpenPltGizmo");
|
QAction *openPltGizmoAct = cmd->getAction("MI_OpenPltGizmo");
|
||||||
menu.addAction(openPltGizmoAct);
|
menu.addAction(openPltGizmoAct);
|
||||||
|
}
|
||||||
QAction *openStyleControlAct = cmd->getAction("MI_OpenStyleControl");
|
QAction *openStyleControlAct = cmd->getAction("MI_OpenStyleControl");
|
||||||
menu.addAction(openStyleControlAct);
|
menu.addAction(openStyleControlAct);
|
||||||
QAction *openStyleNameEditorAct = menu.addAction(tr("Name Editor"));
|
QAction *openStyleNameEditorAct = menu.addAction(tr("Name Editor"));
|
||||||
|
|
Loading…
Reference in a new issue