Remove the fixed-size workaround, only one action is used now in this case

svn path=/trunk/KDE/kdebase/apps/; revision=1176537

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 5f8b8cdebea7331e29ca3acb950f19a6195f6916..2a29940868f72226df93a6ea155352ec78a8d28b 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -443,20 +443,12 @@ void DolphinContextMenu::addCustomActions()
 
 void DolphinContextMenu::updateRemoveAction()
 {
-    // Set the current size as fixed size so that the menu isn't flickering when pressing shift.
-    m_popup->setFixedSize(m_popup->size());
-
     const KActionCollection* collection = m_mainWindow->actionCollection();
     const bool moveToTrash = capabilities().isLocal() && !m_shiftPressed;
     const QAction* action = moveToTrash ? collection->action("move_to_trash") : collection->action("delete");
     m_removeAction->setText(action->text());
     m_removeAction->setIcon(action->icon());
     m_removeAction->setShortcuts(action->shortcuts());
-
-    // This sets the menu back to a dynamic size followed by a forced resize in case the
-    // newly made visible action has bigger text.
-    m_popup->setFixedSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
-    m_popup->resize(m_popup->sizeHint());
 }
 
 #include "dolphincontextmenu.moc"