remove the title label from lfo_controller_artwork.png/new alignment (L…

…MMS#2999)
sdasda7777 · Aug 26, 2016 · 5592d77 · 5592d77
1 parent 0e2c709
commit 5592d77
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/data/themes/default/lfo_controller_artwork.png b/data/themes/default/lfo_controller_artwork.png
diff --git a/src/gui/LfoControllerDialog.cpp b/src/gui/LfoControllerDialog.cpp
@@ -44,19 +44,19 @@
 #include "TempoSyncKnob.h"
 #include "PixmapButton.h"
 
-const int CD_ENV_KNOBS_LBL_Y = 20;
+const int CD_ENV_KNOBS_LBL_Y = 11;
 const int CD_KNOB_X_SPACING = 32;
 
 const int CD_LFO_SHAPES_X = 6;
-const int CD_LFO_SHAPES_Y = 36;
+const int CD_LFO_SHAPES_Y = CD_ENV_KNOBS_LBL_Y + 4;
 
-const int CD_LFO_GRAPH_Y = CD_ENV_KNOBS_LBL_Y+15;
+const int CD_LFO_GRAPH_Y = CD_ENV_KNOBS_LBL_Y+3;
 const int CD_LFO_CD_KNOB_Y = CD_LFO_GRAPH_Y-2;
-const int CD_LFO_BASE_CD_KNOB_X = CD_LFO_SHAPES_X + 64;
+const int CD_LFO_BASE_CD_KNOB_X = CD_LFO_SHAPES_X + 68;
 const int CD_LFO_SPEED_CD_KNOB_X = CD_LFO_BASE_CD_KNOB_X+CD_KNOB_X_SPACING;
 const int CD_LFO_AMOUNT_CD_KNOB_X = CD_LFO_SPEED_CD_KNOB_X+CD_KNOB_X_SPACING;
 const int CD_LFO_PHASE_CD_KNOB_X = CD_LFO_AMOUNT_CD_KNOB_X+CD_KNOB_X_SPACING;
-const int CD_LFO_MULTIPLIER_X = CD_LFO_PHASE_CD_KNOB_X+CD_KNOB_X_SPACING;
+const int CD_LFO_MULTIPLIER_X = CD_LFO_PHASE_CD_KNOB_X+CD_KNOB_X_SPACING+3;
 
 LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent ) :
 	ControllerDialog( _model, _parent )
@@ -67,7 +67,7 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent
 	title.append( ")" );
 	setWindowTitle( title );
 	setWindowIcon( embed::getIconPixmap( "controller" ) );
-	setFixedSize( 240, 80 );
+	setFixedSize( 240, 58 );
 
 	ToolTip::add( this, tr( "LFO Controller" ) );
 
@@ -201,21 +201,21 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent
 
 
 	PixmapButton * x1 = new PixmapButton( this, NULL );
-	x1->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y );
+	x1->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y +7);
 	x1->setActiveGraphic( embed::getIconPixmap(
 						"lfo_x1_active" ) );
 	x1->setInactiveGraphic( embed::getIconPixmap(
 						"lfo_x1_inactive" ) );
 
 	PixmapButton * x100 = new PixmapButton( this, NULL );
-	x100->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y - 15 );
+	x100->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y - 8 );
 	x100->setActiveGraphic( embed::getIconPixmap(
 						"lfo_x100_active" ) );
 	x100->setInactiveGraphic( embed::getIconPixmap(
 						"lfo_x100_inactive" ) );
 
 	PixmapButton * d100 = new PixmapButton( this, NULL );
-	d100->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y + 15 );
+	d100->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y + 22 );
 	d100->setActiveGraphic( embed::getIconPixmap(
 						"lfo_d100_active" ) );
 	d100->setInactiveGraphic( embed::getIconPixmap(
@@ -231,8 +231,7 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent
 
 	setAutoFillBackground( true );
 	QPalette pal;
-	pal.setBrush( backgroundRole(),
-					embed::getIconPixmap( "lfo_controller_artwork" ) );
+	pal.setBrush( backgroundRole(), embed::getIconPixmap( "lfo_controller_artwork" ) );
 	setPalette( pal );
 
 }