@@ -178,6 +178,48 @@ QgsCompoundColorWidget::QgsCompoundColorWidget( QWidget *parent, const QColor &c
178
178
mSpinBoxRadius ->setValue ( settings.value ( QStringLiteral ( " Windows/ColorDialog/sampleRadius" ), 1 ).toInt () );
179
179
mSamplePreview ->setColor ( QColor () );
180
180
181
+ // hidpi friendly sizes
182
+ const int swatchWidth = static_cast < int >( std::round ( std::max ( Qgis::UI_SCALE_FACTOR * 1.9 * mSwatchButton1 ->fontMetrics ().height (), 38.0 ) ) );
183
+ const int swatchHeight = static_cast < int >( std::round ( std::max ( Qgis::UI_SCALE_FACTOR * 1.5 * mSwatchButton1 ->fontMetrics ().height (), 30.0 ) ) );
184
+ mSwatchButton1 ->setMinimumSize ( swatchWidth, swatchHeight );
185
+ mSwatchButton1 ->setMaximumSize ( swatchWidth, swatchHeight );
186
+ mSwatchButton2 ->setMinimumSize ( swatchWidth, swatchHeight );
187
+ mSwatchButton2 ->setMaximumSize ( swatchWidth, swatchHeight );
188
+ mSwatchButton3 ->setMinimumSize ( swatchWidth, swatchHeight );
189
+ mSwatchButton3 ->setMaximumSize ( swatchWidth, swatchHeight );
190
+ mSwatchButton4 ->setMinimumSize ( swatchWidth, swatchHeight );
191
+ mSwatchButton4 ->setMaximumSize ( swatchWidth, swatchHeight );
192
+ mSwatchButton5 ->setMinimumSize ( swatchWidth, swatchHeight );
193
+ mSwatchButton5 ->setMaximumSize ( swatchWidth, swatchHeight );
194
+ mSwatchButton6 ->setMinimumSize ( swatchWidth, swatchHeight );
195
+ mSwatchButton6 ->setMaximumSize ( swatchWidth, swatchHeight );
196
+ mSwatchButton7 ->setMinimumSize ( swatchWidth, swatchHeight );
197
+ mSwatchButton7 ->setMaximumSize ( swatchWidth, swatchHeight );
198
+ mSwatchButton8 ->setMinimumSize ( swatchWidth, swatchHeight );
199
+ mSwatchButton8 ->setMaximumSize ( swatchWidth, swatchHeight );
200
+ mSwatchButton9 ->setMinimumSize ( swatchWidth, swatchHeight );
201
+ mSwatchButton9 ->setMaximumSize ( swatchWidth, swatchHeight );
202
+ mSwatchButton10 ->setMinimumSize ( swatchWidth, swatchHeight );
203
+ mSwatchButton10 ->setMaximumSize ( swatchWidth, swatchHeight );
204
+ mSwatchButton11 ->setMinimumSize ( swatchWidth, swatchHeight );
205
+ mSwatchButton11 ->setMaximumSize ( swatchWidth, swatchHeight );
206
+ mSwatchButton12 ->setMinimumSize ( swatchWidth, swatchHeight );
207
+ mSwatchButton12 ->setMaximumSize ( swatchWidth, swatchHeight );
208
+ mSwatchButton13 ->setMinimumSize ( swatchWidth, swatchHeight );
209
+ mSwatchButton13 ->setMaximumSize ( swatchWidth, swatchHeight );
210
+ mSwatchButton14 ->setMinimumSize ( swatchWidth, swatchHeight );
211
+ mSwatchButton14 ->setMaximumSize ( swatchWidth, swatchHeight );
212
+ mSwatchButton15 ->setMinimumSize ( swatchWidth, swatchHeight );
213
+ mSwatchButton15 ->setMaximumSize ( swatchWidth, swatchHeight );
214
+ mSwatchButton16 ->setMinimumSize ( swatchWidth, swatchHeight );
215
+ mSwatchButton16 ->setMaximumSize ( swatchWidth, swatchHeight );
216
+ const int previewHeight = static_cast < int >( std::round ( std::max ( Qgis::UI_SCALE_FACTOR * 2.0 * mSwatchButton1 ->fontMetrics ().height (), 40.0 ) ) );
217
+ mColorPreview ->setMinimumSize ( 0 , previewHeight );
218
+ mPreviewWidget ->setMaximumHeight ( previewHeight * 2 );
219
+ const int swatchAddSize = static_cast < int >( std::round ( std::max ( Qgis::UI_SCALE_FACTOR * 1.4 * mSwatchButton1 ->fontMetrics ().height (), 28.0 ) ) );
220
+ mAddCustomColorButton ->setMinimumWidth ( swatchAddSize );
221
+ mAddCustomColorButton ->setMaximumWidth ( swatchAddSize );
222
+
181
223
if ( color.isValid () )
182
224
{
183
225
setColor ( color );
0 commit comments