diff options
| author | Peter Penz <[email protected]> | 2010-09-17 22:59:37 +0000 |
|---|---|---|
| committer | Peter Penz <[email protected]> | 2010-09-17 22:59:37 +0000 |
| commit | 4822c2cc3bcdc70d73bb76dd627b04312d463265 (patch) | |
| tree | beabfe38561b77c96bc8fc206a1adbce0d1494f5 /src/dolphincontextmenu.cpp | |
| parent | 23a4868deacf65edc4a0c6cec9dbd9b15f20e18a (diff) | |
Remove the fixed-size workaround, only one action is used now in this case
svn path=/trunk/KDE/kdebase/apps/; revision=1176537
Diffstat (limited to 'src/dolphincontextmenu.cpp')
| -rw-r--r-- | src/dolphincontextmenu.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 5f8b8cdeb..2a2994086 100644 --- 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" |
