razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

fix style editor toolbar

Browse source
This commit is contained in:
shun-iwasawa 2021-03-19 12:23:52 +09:00 committed by manongjohn
parent cbdb991f25
commit e15b5e7c02
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/include/toonzqt/styleeditor.h
View file

@ -449,6 +449,8 @@ signals:
protected:
void paintEvent(QPaintEvent *) override;
void mousePressEvent(QMouseEvent *) override;
QSize sizeHint() const override;
};
//=============================================================================

15
toonz/sources/toonzqt/styleeditor.cpp
View file

@ -1528,7 +1528,9 @@ ColorParameterSelector::ColorParameterSelector(QWidget *parent)
, m_index(-1)
, m_chipSize(21, 21)
, m_chipOrigin(0, 1)
, m_chipDelta(21, 0) {}
, m_chipDelta(21, 0) {
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
}
//-----------------------------------------------------------------------------
@ -1594,6 +1596,14 @@ void ColorParameterSelector::mousePressEvent(QMouseEvent *event) {
}
}
//-----------------------------------------------------------------------------
QSize ColorParameterSelector::sizeHint() const {
return QSize(m_chipOrigin.x() + (m_colors.size() - 1) * m_chipDelta.x() +
m_chipSize.width(),
m_chipOrigin.y() + m_chipSize.height());
}
//*****************************************************************************
// PlainColorPage implementation
//*****************************************************************************
@ -3136,9 +3146,6 @@ StyleEditor::StyleEditor(PaletteController *paletteController, QWidget *parent)
m_toolBar->setMaximumHeight(22);
m_toolBar->addWidget(m_colorParameterSelector);
m_colorParameterSelector->setMinimumWidth(150);
m_colorParameterSelector->setFixedHeight(22);
QMenu *menu = new QMenu();
m_wheelAction = new QAction(tr("Wheel"), this);
m_hsvAction = new QAction(tr("HSV"), this);