diff --git a/toonz/sources/include/toonzqt/styleeditor.h b/toonz/sources/include/toonzqt/styleeditor.h index 460483d..e4e93c6 100644 --- a/toonz/sources/include/toonzqt/styleeditor.h +++ b/toonz/sources/include/toonzqt/styleeditor.h @@ -434,6 +434,8 @@ signals: protected: void paintEvent(QPaintEvent *) override; void mousePressEvent(QMouseEvent *) override; + + QSize sizeHint() const override; }; //============================================================================= diff --git a/toonz/sources/toonzqt/styleeditor.cpp b/toonz/sources/toonzqt/styleeditor.cpp index d4aa79b..4d01f35 100644 --- a/toonz/sources/toonzqt/styleeditor.cpp +++ b/toonz/sources/toonzqt/styleeditor.cpp @@ -1426,7 +1426,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); +} //----------------------------------------------------------------------------- @@ -1492,6 +1494,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 //***************************************************************************** @@ -2996,9 +3006,6 @@ StyleEditor::StyleEditor(PaletteController *paletteController, QWidget *parent) m_toolBar->setMaximumHeight(22); m_toolBar->addWidget(m_colorParameterSelector); - m_colorParameterSelector->setMinimumWidth(200); - m_colorParameterSelector->setFixedHeight(22); - QMenu *menu = new QMenu(); m_wheelAction = new QAction(tr("Wheel"), this); m_hsvAction = new QAction(tr("HSV"), this);