kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 00:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=1176537
This commit is contained in:
Peter Penz 2010-09-17 22:59:37 +00:00
parent a7ef29e076
commit 9ea9c0f73e
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dolphin/src/dolphincontextmenu.cpp
View file

@ -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"