From f3ce31250d2b826586d539f4caebe5820f7a9fb5 Mon Sep 17 00:00:00 2001 From: BaraMGB Date: Fri, 26 Aug 2016 13:01:07 +0200 Subject: [PATCH] remove the title label from lfo_controller_artwork.png/new alignment (#2999) --- .../themes/default/lfo_controller_artwork.png | Bin 1214 -> 9045 bytes src/gui/LfoControllerDialog.cpp | 21 +++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/data/themes/default/lfo_controller_artwork.png b/data/themes/default/lfo_controller_artwork.png index 85f39110c5e474c78f4803b08fa128da545c1b3a..3928db24c07cf076ed1e03c14d4462ab980fbef0 100644 GIT binary patch literal 9045 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 ZizROQ*`8VQ6<8oKc)I$ztaD0e0s#8SQhxvd diff --git a/src/gui/LfoControllerDialog.cpp b/src/gui/LfoControllerDialog.cpp index 6db0bb72c..d0282b655 100644 --- 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 ); }