From d47051ba2b6af85e61cc8821db2ac991a4ed2041 Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Wed, 28 Jan 2009 08:38:14 +0000 Subject: [PATCH] Minor gui changes git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1976 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 31 ++++++++++++++++++++++++ src/gui/widgets/controller_rack_view.cpp | 1 + src/gui/widgets/effect_rack_view.cpp | 1 + src/gui/widgets/fader.cpp | 6 ++--- 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0ea909f6..a5833620f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,37 @@ - Add LmmsStyle class for centralizing palette and drawing. It isn't perfect, but at least most interesting stylables are in one place now. + * include/track.h: + * src/core/track.cpp: + * src/gui/track_container_view.cpp: + Properly update track backgrounds when realigning tracks + + * src/gui/piano_roll.cpp: + * src/gui/widgets/visualization_widget.cpp: + Plug memory leaks + + * src/gui/widgets/fader.cpp: + Make fader size flexible + + + * src/gui/widgets/controller_rack_view.cpp: + * src/gui/widgets/effect_rack_view.cpp: + Prevent Horizontal bars from appearing in some cases + + src/gui/fx_mixer_view.cpp + srg/gui/widgets/graph.cpp + src/gui/widgets/visualization_widget.cpp + src/gui/widgets/led_checkbox.cpp + src/gui/widgets/envelope_and_lfo_view.cpp + src/gui/widgets/lcd_spinbox.cpp + src/gui/widgets/text_float.cpp + src/gui/widgets/controller_view.cpp + + + + + + 2009-01-26 Paul Giblock * src/tracks/bb_track.cpp: diff --git a/src/gui/widgets/controller_rack_view.cpp b/src/gui/widgets/controller_rack_view.cpp index 558dcec8a..6f3b08aeb 100644 --- a/src/gui/widgets/controller_rack_view.cpp +++ b/src/gui/widgets/controller_rack_view.cpp @@ -52,6 +52,7 @@ controllerRackView::controllerRackView( ) : m_scrollArea = new QScrollArea( this ); m_scrollArea->setFixedSize( 230, 184 ); m_scrollArea->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); + m_scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); m_scrollArea->setPalette( QApplication::palette( m_scrollArea ) ); m_scrollArea->move( 6, 22 ); diff --git a/src/gui/widgets/effect_rack_view.cpp b/src/gui/widgets/effect_rack_view.cpp index ca4f10298..0fb2ae5c6 100644 --- a/src/gui/widgets/effect_rack_view.cpp +++ b/src/gui/widgets/effect_rack_view.cpp @@ -55,6 +55,7 @@ effectRackView::effectRackView( effectChain * _model, QWidget * _parent ) : m_scrollArea = new QScrollArea( m_effectsGroupBox ); m_scrollArea->setFixedSize( 230, 184 ); m_scrollArea->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); + m_scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); m_scrollArea->setPalette( QApplication::palette( m_scrollArea ) ); m_scrollArea->setWidget( new QWidget ); m_scrollArea->move( 6, 22 ); diff --git a/src/gui/widgets/fader.cpp b/src/gui/widgets/fader.cpp index ce52835d3..2137d723c 100644 --- a/src/gui/widgets/fader.cpp +++ b/src/gui/widgets/fader.cpp @@ -216,15 +216,15 @@ void fader::paintEvent( QPaintEvent * ev) painter.drawPixmap( QRect( 11, peak_R, 11, 116 - peak_R ), m_leds, QRect( 11, peak_R, 11, 116 - peak_R ) ); // knob - static const uint knob_height = 29; - static const uint knob_width = 15; + const uint knob_height = m_knob.height(); + const uint knob_width = m_knob.width(); float fRange = m_model->maxValue() - m_model->minValue(); float realVal = m_model->value() - m_model->minValue(); // uint knob_y = (uint)( 116.0 - ( 86.0 * ( m_model->value() / fRange ) ) ); - uint knob_y = (uint)( 116.0 - ( 86.0 * ( realVal / fRange ) ) ); + uint knob_y = (uint)( 116.0 - ( (116.0-knob_height) * ( realVal / fRange ) ) ); painter.drawPixmap( QRect( 4, knob_y - knob_height, knob_width, knob_height), m_knob, QRect( 0, 0, knob_width, knob_height ) );