File kde-290123.patch of Package amarok
diff -ur amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp amarok-2.5.0.fixed/src/context/toolbar/AppletToolbar.cpp
--- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp 2011-12-15 08:36:48.000000000 +0100
+++ amarok-2.5.0.fixed/src/context/toolbar/AppletToolbar.cpp 2012-01-27 11:06:27.089992129 +0100
@@ -67,6 +67,19 @@
}
void
+
+Context::AppletToolbar::setContainment( Containment * containment )
+{
+ m_cont = containment;
+}
+
+Context::Containment *
+Context::AppletToolbar::containment() const
+{
+ return m_cont;
+}
+
+void
Context::AppletToolbar::resizeEvent( QGraphicsSceneResizeEvent * event )
{
debug() << "setting layout to" << QRectF( QPointF( 0, 0 ), event->newSize() );
diff -ur amarok-2.5.0/src/context/toolbar/AppletToolbar.h amarok-2.5.0.fixed/src/context/toolbar/AppletToolbar.h
--- amarok-2.5.0/src/context/toolbar/AppletToolbar.h 2011-12-15 08:36:48.000000000 +0100
+++ amarok-2.5.0.fixed/src/context/toolbar/AppletToolbar.h 2012-01-27 11:05:58.149992133 +0100
@@ -55,6 +55,9 @@
void appletRemoved( Plasma::Applet* applet );
+ void setContainment( Containment * containment );
+ Containment* containment() const;
+
signals:
void showApplet( Plasma::Applet* );
void appletAddedToToolbar( Plasma::Applet* applet, int loc );
diff -ur amarok-2.5.0/src/context/ToolbarView.cpp amarok-2.5.0.fixed/src/context/ToolbarView.cpp
--- amarok-2.5.0/src/context/ToolbarView.cpp 2011-12-15 08:36:48.000000000 +0100
+++ amarok-2.5.0.fixed/src/context/ToolbarView.cpp 2012-01-27 11:05:58.149992133 +0100
@@ -74,7 +74,9 @@
setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
// now we create the toolbar
- m_toolbar = new AppletToolbar( containment );
+ m_toolbar = new AppletToolbar(0);
+ scene->addItem(m_toolbar.data());
+ m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) );
m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
@@ -96,7 +98,7 @@
Context::ToolbarView::~ToolbarView()
{
-
+ delete m_toolbar.data();
}
void