Fix for bug 9366: incorrect size of the 'Select color' buttons

diff --git a/src/Plot2d/Plot2d_SetupCurveDlg.cxx b/src/Plot2d/Plot2d_SetupCurveDlg.cxx
index 1f6c3729d7fa402fd2a729b96804de37fd0c7c01..4f73cff03990d86dcb6ac8e14009ca8f36ca8004 100644 (file)
--- a/src/Plot2d/Plot2d_SetupCurveDlg.cxx
+++ b/src/Plot2d/Plot2d_SetupCurveDlg.cxx
@@ -85,7 +85,7 @@ Plot2d_SetupCurveDlg::Plot2d_SetupCurveDlg( QWidget* parent )
 
   QLabel* aColorLab = new QLabel( tr( "CURVE_COLOR_LAB" ), TopGroup );
   myColorBtn = new QToolButton( TopGroup );
-  myColorBtn->setMinimumWidth(25);
+  myColorBtn->setMinimumSize(25, 25);
 
   TopGroupLayout->addWidget( aLineTypeLab, 0, 0 );
   TopGroupLayout->addMultiCellWidget( myLineCombo, 0, 0, 1, 2 );

diff --git a/src/SPlot2d/SPlot2d_SetupPlot2dDlg.cxx b/src/SPlot2d/SPlot2d_SetupPlot2dDlg.cxx
index d53a8f9f9be946cd4491242d5326aa3641178dce..128a8b2dd9e14bae01f30def0b00016919d5c95d 100644 (file)
--- a/src/SPlot2d/SPlot2d_SetupPlot2dDlg.cxx
+++ b/src/SPlot2d/SPlot2d_SetupPlot2dDlg.cxx
@@ -508,7 +508,8 @@ void SPlot2d_ItemContainer::createWidgets( QWidget* parentWidget )
   myMarkerCombo->setCurrentItem( 1 ); // CIRCLE by default
 
   myColorBtn = new QToolButton( parentWidget );
-
+  myColorBtn->setMinimumWidth( 20 );
+ 
   connect( myAutoCheck, SIGNAL( clicked() ),       this, SLOT( onAutoChanged() ) );
   connect( myColorBtn,  SIGNAL( clicked() ),       this, SLOT( onColorChanged() ) );
   connect( myHBtn,      SIGNAL( toggled( bool ) ), this, SLOT( onHVToggled( bool ) ) );