From bf03fa7eb25024892500a0fd0e04ea7b22714188 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 16 Mar 2009 18:18:30 +0100 Subject: [PATCH] Vibed: fixed legacy code in NineButtonSelector In Qt3 we had to take care of drawing background properly if there were semitransparent child widgets. This code had been ported to the Qt4 version but is obsolete and causes a crash when for example dragging a Vibed preset onto an existing instrument track. This commit removes this code. (closes #2688270) (cherry picked from commit d3cc908f439462733fece7012e7a3b4463b64012) --- plugins/vibed/nine_button_selector.cpp | 7 +------ plugins/vibed/nine_button_selector.h | 8 ++++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/plugins/vibed/nine_button_selector.cpp b/plugins/vibed/nine_button_selector.cpp index ca6415d75..864a06a16 100644 --- a/plugins/vibed/nine_button_selector.cpp +++ b/plugins/vibed/nine_button_selector.cpp @@ -2,6 +2,7 @@ * nine_button_selector.cpp * * Copyright (c) 2006-2007 Danny McRae + * Copyright (c) 2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -57,14 +58,8 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, QString::null, TRUE ), this ) { setFixedSize( 50, 50 ); - m_base = QPixmap::grabWidget( _parent, _x, _y ); move( _x, _y ); - setAutoFillBackground( TRUE ); - QPalette pal = palette(); - pal.setBrush( backgroundRole(), m_base ); - setPalette( pal ); - m_button = new pixmapButton( this, NULL ); m_button->move( 1, 1 ); m_button->setActiveGraphic( _button0_on ); diff --git a/plugins/vibed/nine_button_selector.h b/plugins/vibed/nine_button_selector.h index 3a3605dd1..67e247375 100644 --- a/plugins/vibed/nine_button_selector.h +++ b/plugins/vibed/nine_button_selector.h @@ -2,6 +2,7 @@ * nine_button_selector.h * * Copyright (c) 2006-2007 Danny McRae + * Copyright (c) 2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -85,11 +86,10 @@ private: QList m_buttons; pixmapButton * m_button; pixmapButton * m_lastBtn; - QPixmap m_base; - Uint8 m_selected; - -}; + int m_selected; + +} ; typedef intModel nineButtonSelectorModel;